--- DarthVader/OrbitalInfo/Makefile	2013/11/06 13:22:01	1.28
+++ DarthVader/OrbitalInfo/Makefile	2014/03/28 20:47:14	1.32
@@ -1,6 +1,10 @@
 #Orbital Information for flight analysis software 
 # SOFTWARE VERSION
+<<<<<<< Makefile
 VER= v4r02
+=======
+VER= v4r05
+>>>>>>> 1.31
 #
 include ../Make.def
 # Here the variables definig the local directories