From 52c42031fb414ba40843c7099504a1eba889f330 Mon Sep 17 00:00:00 2001
From: Kevin Griffin <griffin.kev@gmail.com>
Date: Fri, 18 Dec 2020 17:58:45 -0500
Subject: [PATCH] latest plenum dev version

---
 setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup.py b/setup.py
index 708571dd0..13870e760 100644
--- 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'],