Changeset 6e1e2d0 for src/CompilationState.h

Timestamp:

May 1, 2023, 4:19:09 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

c083c3d

Parents:

a50fdfb (diff), 985b624 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolved merge conflicts

File:

• src/CompilationState.h (modified) (2 diffs)

src/CompilationState.h

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Mon Ju1 30 10:47:01 2018
-// Last Modified By : Henry Xue
-// Last Modified On : Tue Jul 20 04:27:35 2021
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Apr 10 19:12:53 2023
+// Update Count     : 6
 //
 
@@ -26 +26 @@
         expraltp,
         genericsp,
+        invariant,
         libcfap,
         nopreludep,