bump to 0.10.20

f4898f58 · Chris Dodge · 07ff5790 · f4898f58
Commit f4898f58 authored Nov 10, 2015 by Chris Dodge
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

setup.py
+0 -4

No files found.
--- a/setup.py
+++ b/setup.py
@@ -34,11 +34,7 @@ def load_requirements(*requirements_paths):

 setup(
    name='edx-proctoring',
-<<<<<<< HEAD
    version='0.11.0',
-=======
-    version='0.10.19',
->>>>>>> Substitute all illegal characters when registering exams with SoftwareSecure
    description='Proctoring subsystem for Open edX',
    long_description=open('README.md').read(),
    author='edX',