Fixed botched merge

e41897e7 · tibbe · 196ecdee · e41897e7
Commit e41897e7 authored Jun 26, 2014 by tibbe
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Cabal/Cabal.cabal Cabal/Cabal.cabal +0 -4

No files found.
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
 name: Cabal
-<<<<<<< HEAD
 version: 1.21.0.0
-=======
-version: 1.20.0.1
->>>>>>> 1.20
 copyright: 2003-2006, Isaac Jones
           2005-2011, Duncan Coutts
 license: BSD3