--- DarthVader/OrbitalInfo/Makefile	2014/03/28 20:47:14	1.32
+++ DarthVader/OrbitalInfo/Makefile	2015/03/26 14:55:37	1.45
@@ -1,10 +1,6 @@
 #Orbital Information for flight analysis software 
 # SOFTWARE VERSION
-<<<<<<< Makefile
-VER= v4r02
-=======
-VER= v4r05
->>>>>>> 1.31
+VER= v4r18
 #
 include ../Make.def
 # Here the variables definig the local directories