From f09ce60d45d5524e36d07e76814b6e0cbc554288 Mon Sep 17 00:00:00 2001
From: Carlo Zancanaro <carlo@carlo-laptop>
Date: Mon, 28 May 2012 21:50:12 +1000
Subject: Fix issues with some things ignoring strategies.

---
 impl/systems/long-fixpoint | 1 -
 1 file changed, 1 deletion(-)

(limited to 'impl/systems/long-fixpoint')

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
-- 
cgit v1.2.3