From e42eb636f31ae3dab3444819551e54f212124f90 Mon Sep 17 00:00:00 2001 From: Peter Trommler Date: Tue, 6 Oct 2015 17:43:22 +0200 Subject: [PATCH 1/1] Fix merge error. --- compiler/nativeGen/PPC/Regs.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/compiler/nativeGen/PPC/Regs.hs b/compiler/nativeGen/PPC/Regs.hs index 7af7ffb..a66ea36 100644 --- a/compiler/nativeGen/PPC/Regs.hs +++ b/compiler/nativeGen/PPC/Regs.hs @@ -37,7 +37,6 @@ module PPC.Regs ( fits16Bits, makeImmediate, fReg, - sp, r3, r4, r27, r28, r30, r0, sp, r3, r4, r27, r28, r30, tmpReg, f1, f20, f21, -- 2.3.8 (Apple Git-58)