Index: doc/LaTeXmacros/common.tex
===================================================================
--- doc/LaTeXmacros/common.tex	(revision c45170a282ebfb35f0ce6eec6cec991fe3531bb6)
+++ doc/LaTeXmacros/common.tex	(revision 182fe1ec6f8ba5254e754ba3ba2dde6089336ee0)
@@ -10,7 +10,13 @@
 %% 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
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -227,5 +233,5 @@
 	morekeywords={_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto,
 		_Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__,
-		fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
+		fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
 		_Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,},
 }%