From 6009c3ae0bb21b6ac5995f027ea8546ebe8798b4 Mon Sep 17 00:00:00 2001 From: Gabriel Monnerat <gabriel@tiolive.com> Date: Mon, 26 Mar 2012 13:46:24 -0300 Subject: [PATCH] fix mistake during the merge from erp5 branch to master. Removing diff tags --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py index 6fc76be2a..825bc5f1c 100644 --- 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', -- 2.30.9