Generate config

ElevenPaths · Mar 28, 2018 · c03ce92 · c03ce92
1 parent 278c44a
commit c03ce92
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -71,9 +71,6 @@ def read_file(filename):
 # Setup AtomShields
 from atomshields.scanner import AtomShieldsScanner
 AtomShieldsScanner.setup()
-<<<<<<< HEAD
 AtomShieldsScanner.generateConfig(show = False)
 
 
-=======
->>>>>>> ccc8614f93e9164f5c419ec1461dd665d71356de