Commit e41897e7 authored by tibbe's avatar tibbe
Browse files

Fixed botched merge

parent 196ecdee
name: Cabal
<<<<<<< HEAD
>>>>>>> 1.20
copyright: 2003-2006, Isaac Jones
2005-2011, Duncan Coutts
license: BSD3
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment