remove git targets. It should be removed during the merge

component/slapos/buildout.cfg

@@ -155,5 +155,4 @@ supervisor = 3.0a12
 
 # Required by:
 # slapos.core==0.23
->>>>>>> master
 zope.interface = 3.8.0

slapos/recipe/davstorage/__init__.py

@@ -109,4 +109,3 @@ def promise(args):
   connection.getresponse()
 
   return 0
->>>>>>> master

slapos/recipe/lamp/__init__.py

@@ -172,13 +172,11 @@ class BaseRecipe(BaseSlapRecipe):
       argument = argument + ["-d", mysql_conf['mysql_database'],
                              "-H", mysql_conf['mysql_host'], "-P", mysql_conf['mysql_port'],
                              "-p", mysql_conf['mysql_password'], "-u", mysql_conf['mysql_user'],
-=======
     argument = [self.options['lampconfigure_directory'].strip(),
                              "-H", mysql_conf['mysql_host'], "-P", mysql_conf['mysql_port'],
                              "-p", mysql_conf['mysql_password'], "-u", mysql_conf['mysql_user']]
     if not self.options.has_key('file_token'):
       argument = argument + ["-d", mysql_conf['mysql_database'],
->>>>>>> master
                              "--table", self.options['table_name'].strip(), "--cond",
                              self.options['constraint'].strip()]
     else:
@@ -240,7 +238,6 @@ class Simple(BaseRecipe):
       rename=renamed,
       **mysql_conf
     ))
-=======
     renamed = self.configureInstallation(document_root, url, mysql_conf)
     connectionDict = dict(
       url=url,      
@@ -249,7 +246,6 @@ class Simple(BaseRecipe):
     if not renamed == "":
       connectionDict['rename'] = renamed
     self.setConnectionDict(connectionDict)
->>>>>>> master
     if self.options.has_key('template') and self.options.has_key('configuration'):
       self.createConfiguration(self.options['template'], document_root,
           self.options['configuration'], mysql_conf)

slapos/recipe/librecipe/generic.py

@@ -167,4 +167,3 @@ class GenericBaseRecipe(object):
     url = urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
 
     return url
->>>>>>> master