Index: doc/LaTeXmacros/common.tex
===================================================================
--- doc/LaTeXmacros/common.tex	(revision 182fe1ec6f8ba5254e754ba3ba2dde6089336ee0)
+++ doc/LaTeXmacros/common.tex	(revision 155cce0f0782736bc82b78fee0c0636e9a10ca21)
@@ -10,16 +10,8 @@
 %% Author           : Peter A. Buhr
 %% Created On       : Sat Apr  9 10:06:17 2016
-<<<<<<< HEAD
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Mon Aug  1 08:57:17 2016
-%% Update Count     : 223
-=======
-%% Last Modified By : 
-%% Last Modified On : Sun Jul 31 07:22:50 2016
-%% Update Count     : 207
->>>>>>> 080615890f586cb9954c252b55cab47f52c25758
+%% Last Modified On : Mon Aug  1 09:11:20 2016
+%% Update Count     : 225
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \setlength{\textheight}{9in}