minor

bheads · Dec 9, 2011 · a86b6c2 · a86b6c2
1 parent 8d51647
commit a86b6c2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/rtrt/rtrt.pro.user b/rtrt/rtrt.pro.user
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
+<<<<<<< HEAD
 <!-- Written by Qt Creator 2.3.1, 2011-12-07T20:17:05. -->
+=======
+<!-- Written by Qt Creator 2.3.1, 2011-12-08T22:19:45. -->
+>>>>>>> armadillo
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>