Resolved conflict with due to slapos.py

46844684 · Cédric Le Ninivin · 4c4625a9 · 46844684 · 46844684
Commit 46844684 authored Aug 17, 2012 by Cédric Le Ninivin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

setup.py setup.py +1 -1

slapos/slapos-entry.py slapos/slapos-entry.py +0 -0

No files found.
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,7 @@ setup(name=name,
          'slapgrid-supervisord = slapos.grid.svcbackend:supervisord',
          'slapproxy = slapos.proxy:main',
          'bang = slapos.bang:main',
-          'slapos = slapos.slapos:main',
+          'slapos = slapos.slapos-entry:main',
        ]
      },
      test_suite="slapos.tests",

--- a/slapos/slapos.py
+++ b/slapos/slapos.py