summaryrefslogtreecommitdiff
path: root/impl/systems/long-fixpoint
diff options
context:
space:
mode:
Diffstat (limited to 'impl/systems/long-fixpoint')
-rw-r--r--impl/systems/long-fixpoint1
1 files changed, 1 insertions, 0 deletions
diff --git a/impl/systems/long-fixpoint b/impl/systems/long-fixpoint
index 5838910..f56b700 100644
--- a/impl/systems/long-fixpoint
+++ b/impl/systems/long-fixpoint
@@ -98,6 +98,7 @@ x96 = x95
x97 = x96
x98 = x97
x99 = x98
+<<<<<<< HEAD
x100 = x99
x101 = x100
x102 = x101