From c799ecbf83eeda4d79a99ddbb846aa459a28c4d0 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Mon, 27 Apr 2015 12:16:04 -0700
Subject: [PATCH] Fixing bad merge

---
 tests/ui/src/main.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/ui/src/main.cpp b/tests/ui/src/main.cpp
index b5d9480a36..6235187a9f 100644
--- a/tests/ui/src/main.cpp
+++ b/tests/ui/src/main.cpp
@@ -239,11 +239,7 @@ public:
     }
 };
 
-<<<<<<< HEAD
-const QString & getResourcesDir() {
-=======
-const QString& getQmlDir() {
->>>>>>> vr_menus
+const QString& getResourcesDir() {
     static QString dir;
     if (dir.isEmpty()) {
         QDir path(__FILE__);
@@ -254,7 +250,7 @@ const QString& getQmlDir() {
     return dir;
 }
 
-const QString & getQmlDir() {
+const QString& getQmlDir() {
     static QString dir;
     if (dir.isEmpty()) {
         dir = getResourcesDir() + "qml/";