Changeset 79f64f1

Timestamp:

Aug 1, 2016, 9:43:14 AM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

d0542c4, e7b2559

Parents:

182fe1e

Message:

fix merge problem

Location:

doc

Files:

• LaTeXmacros/common.tex (modified) (1 diff)
• user/user.tex (modified) (1 diff)

doc/LaTeXmacros/common.tex

@@ -10 +10 @@
 %% 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}

doc/user/user.tex

@@ -10 +10 @@
 %% Author           : Peter A. Buhr
 %% Created On       : Wed Apr  6 14:53:29 2016
-<<<<<<< HEAD
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Mon Aug  1 08:43:49 2016
-%% Update Count     : 1270
-=======
-%% Last Modified By : 
-%% Last Modified On : Sun Jul 31 07:27:55 2016
-%% Update Count     : 1254
->>>>>>> 080615890f586cb9954c252b55cab47f52c25758
+%% Last Modified On : Mon Aug  1 09:11:24 2016
+%% Update Count     : 1271
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%