Index: src/SynTree/Declaration.h
===================================================================
--- src/SynTree/Declaration.h	(revision 7c6492020eee75b2b4f942492675ee7c9a498b70)
+++ src/SynTree/Declaration.h	(revision 7e91d4f2638e9105eae4f6c7cddb260260f31b04)
@@ -9,12 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-<<<<<<< Updated upstream
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon May 25 13:54:32 2015
-=======
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu May 21 16:27:31 2015
->>>>>>> Stashed changes
-// Update Count     : 5
+// Last Modified On : Mon May 25 14:08:10 2015
+// Update Count     : 6
 //