Commits

Sviatoslav Sydorenko committed 6d283e2

merge fix

Comments (0)

Files changed (1)

                 'coverage>=3.5.1',
                 'lazr.smtptest>=1.3',
                 'ludibrio>=3.1.0',
-<<<<<<< local
-                'tox>=1.3']
+                'tox>=1.6']
+
 speedups = ['cdecimal>=2.3',
         'MarkupSafe>=0.15',
         'hiredis>=0.1.0']
 
 if sys.version_info[:2] < (3, 0):
     speedups.append('simplejson>=2.4.0')
-=======
-                'tox>=1.6']
->>>>>>> other
 
 if sys.version_info[:2] < (2, 7):
     install_requires.append("argparse>=1.2.1")
       package_dir={'': 'src'},
       packages=find_packages('src'),
       include_package_data=True,
-      entry_points={'console_scripts': ['blueberrypy = blueberrypy.command:main']},
+      entry_points={'console_scripts':
+                    ['blueberrypy = blueberrypy.command:main']},
       use_2to3=True,
       zip_safe=False,
       install_requires=install_requires,
-<<<<<<< local
       extras_require={'speedups': speedups,
-                      'all': ['SQLAlchemy>=0.7.6',
-=======
-      extras_require={'speedups': ['cdecimal>=2.3',
-                                   'MarkupSafe>=0.15',
-                                   'hiredis>=0.1.0',
-                                   'simplejson>=2.4.0'],
                       'all': ['SQLAlchemy>=0.9.0',
->>>>>>> other
                               'redis>=2.4.11',
                               'webassets>=0.6',
                               'Routes>=1.12.3',