Index: src/SynTree/Declaration.h
===================================================================
--- src/SynTree/Declaration.h	(revision f38c8d94493ef2254722f48dd70834655bee1b7a)
+++ src/SynTree/Declaration.h	(revision 53a2e97ca573c8d14ddfb7c33e9ee762dec720b9)
@@ -9,7 +9,12 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May 21 23:43:43 2015
-// Update Count     : 3
+<<<<<<< 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
 //
 
@@ -123,6 +128,6 @@
 	CompoundStmt *get_statements() const { return statements; }
 	void set_statements( CompoundStmt *newValue ) { statements = newValue; }
-    bool get_isInline() const { return isInline; }
-//    void set_isInline( bool newValue ) { isInline = newValue; }
+	bool get_isInline() const { return isInline; }
+//	void set_isInline( bool newValue ) { isInline = newValue; }
 	std::list< std::string >& get_oldIdents() { return oldIdents; }
 	std::list< Declaration* >& get_oldDecls() { return oldDecls; }