X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fprelude%2FPrelNames.lhs;h=4bbb479f9427c6989c6c4c27ae1594c3735ce6cc;hp=aa5de1599d0881ad609b50b852375a15f8c2c29a;hb=41cecc14547b049cec20e827ceae8ff312c9ff4f;hpb=b2524b3960999fffdb3767900f58825903f6560f

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index aa5de15..4bbb479 100644
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -1328,7 +1328,6 @@ noSelTyConKey = mkPreludeTyConUnique 154
 
 repTyConKey  = mkPreludeTyConUnique 155
 rep1TyConKey = mkPreludeTyConUnique 156
->>>>>>> 18691d440f90a3dff4ef538091c886af505e5cf5
 
 ---------------- Template Haskell -------------------
 --	USES TyConUniques 200-299