remove rebase markings

2018-05-25 12:16:53 +02:00
parent d6301ebbf3
commit 924ddaded1
1 changed files with 0 additions and 3 deletions
--- a/data/datamysql/datamysql.go
+++ b/data/datamysql/datamysql.go
@@ -122,10 +122,7 @@ func Instance(cfg *config.Config) (contract.DataManager, error) {
 		instance.profile = newProfileRepo(db)
 		instance.organization = newOrganizationRepo(db)
 		instance.zipcodes = newZipcodeRepo(db)
-<<<<<<< HEAD
 		instance.plan = newPlanRepo(db)
-=======
->>>>>>> add datamodel ; check if zipcode is participating
 	})

 	return instance, connErr