From c1a64dc5fa73b54cc5de77629781dfc74302a1e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Wed, 16 Jul 2014 18:30:04 -0700
Subject: [PATCH] rename file and fix merge error

---
 common/headless_view.cpp                 | 2 ++
 test/{comparison.cpp => comparisons.cpp} | 0
 2 files changed, 2 insertions(+)
 rename test/{comparison.cpp => comparisons.cpp} (100%)

diff --git a/common/headless_view.cpp b/common/headless_view.cpp
index 6c4054303..ee1ecf83d 100644
--- a/common/headless_view.cpp
+++ b/common/headless_view.cpp
@@ -1,6 +1,8 @@
 #include "headless_view.hpp"
 #include <llmr/util/timer.hpp>
 
+namespace llmr {
+
 HeadlessView::HeadlessView() {
 #if LLMR_USE_CGL
     // TODO: test if OpenGL 4.1 with GL_ARB_ES2_compatibility is supported
diff --git a/test/comparison.cpp b/test/comparisons.cpp
similarity index 100%
rename from test/comparison.cpp
rename to test/comparisons.cpp