fix mistake during the merge from erp5 branch to master. Removing diff tags

6009c3ae · Gabriel Monnerat · 5af3b21b · 6009c3ae
Commit 6009c3ae authored Mar 26, 2012 by Gabriel Monnerat
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

setup.py setup.py +0 -3

No files found.
--- a/setup.py
+++ b/setup.py
@@ -82,10 +82,7 @@ setup(name=name,
          'notifier = slapos.recipe.notifier:Recipe',
          'notifier.callback = slapos.recipe.notifier:Callback',
          'notifier.notify = slapos.recipe.notifier:Notify',
-<<<<<<< HEAD
          'novnc = slapos.recipe.novnc:Recipe',
-=======
->>>>>>> origin/erp5
          'lamp = slapos.recipe.lamp:Request',
          'lamp.request = slapos.recipe.lamp:Request',
          'lamp.static = slapos.recipe.lamp:Static',