Fix unspotted merge conflict
authorBroganD1993 <darrenbrogan@hotmail.com>
Sun, 1 Jun 2014 12:39:32 +0000 (13:39 +0100)
committerBroganD1993 <darrenbrogan@hotmail.com>
Sun, 1 Jun 2014 12:39:32 +0000 (13:39 +0100)
commitd0ee2666f0955f1799996504fea22a6ff7d746ab
tree491910a4b4716386dbe976d7b1fa595913acc562
parent10a2f42295e999b6438472fe9fc87e91de2d398c
Fix unspotted merge conflict
setup.py