| commit | d0ee2666f0955f1799996504fea22a6ff7d746ab | [log] [tgz] |
|---|---|---|
| author | BroganD1993 <darrenbrogan@hotmail.com> | Sun Jun 01 13:39:32 2014 +0100 |
| committer | BroganD1993 <darrenbrogan@hotmail.com> | Sun Jun 01 13:39:32 2014 +0100 |
| tree | 491910a4b4716386dbe976d7b1fa595913acc562 | |
| parent | 10a2f42295e999b6438472fe9fc87e91de2d398c [diff] |
Fix unspotted merge conflict
diff --git a/setup.py b/setup.py index 58a2dff..7ba4417 100644 --- a/setup.py +++ b/setup.py
@@ -2,10 +2,7 @@ # encoding: utf-8 import os -<<<<<<< HEAD -======= ->>>>>>> tag_support from setuptools import setup