latest plenum dev version

hyperledger · Dec 19, 2020 · 52c4203 · 52c4203
1 parent b2d5bf3
commit 52c4203
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/setup.py b/setup.py
@@ -54,11 +54,15 @@
     data_files=[(
         (BASE_DIR, ['data/nssm_original.exe'])
     )],
+<<<<<<< HEAD
 <<<<<<< HEAD
     install_requires=['indy-plenum==1.13.0.dev1032',
 =======
     install_requires=['indy-plenum==1.12.04',
 >>>>>>> c19e9fdc (using last release of plenum)
+=======
+    install_requires=['indy-plenum==1.13.0.dev1032',
+>>>>>>> 1fdd18b9 (latest plenum dev version)
                       'timeout-decorator==0.4.0',
                       'distro==1.3.0'],
     setup_requires=['pytest-runner'],