From 3aca1f5b4f11a3bb90ecacfb43346a1e2832397d Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Sun, 7 Dec 2008 19:44:30 -0700
Subject: Fixed a few files that apparently weren't updated.

Signed-off-by: Ira Rice <irarice@gmail.com>
---
 CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index afc6ab69..7ac379de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,6 @@
 PROJECT(AETHYRA)
 
-<<<<<<< HEAD:CMakeLists.txt
 SET(VERSION 0.0.27)
-=======
-SET(VERSION 0.0.26)
->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:CMakeLists.txt
 
 # where to look for cmake modules
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
-- 
cgit v1.2.3-60-g2f50