summaryrefslogtreecommitdiff
path: root/impl/systems/long-fixpoint
diff options
context:
space:
mode:
authorCarlo Zancanaro <carlo@carlo-laptop>2012-05-28 21:50:12 +1000
committerCarlo Zancanaro <carlo@carlo-laptop>2012-05-28 21:50:12 +1000
commitf09ce60d45d5524e36d07e76814b6e0cbc554288 (patch)
tree3e7e786a6f0b20ddcd934969c93c09cc02625f70 /impl/systems/long-fixpoint
parent72b70a4ff7dad8185eb2dd652bdd2983b829930a (diff)
Fix issues with some things ignoring strategies.
Diffstat (limited to 'impl/systems/long-fixpoint')
-rw-r--r--impl/systems/long-fixpoint1
1 files changed, 0 insertions, 1 deletions
diff --git a/impl/systems/long-fixpoint b/impl/systems/long-fixpoint
index f56b700..5838910 100644
--- a/impl/systems/long-fixpoint
+++ b/impl/systems/long-fixpoint
@@ -98,7 +98,6 @@ x96 = x95
x97 = x96
x98 = x97
x99 = x98
-<<<<<<< HEAD
x100 = x99
x101 = x100
x102 = x101