From d392672a83e76f1afdad61cd6c6ecff8d8573d5d Mon Sep 17 00:00:00 2001
From: GotPPay <bilal.catic@hotmail.com>
Date: Fri, 25 May 2018 12:16:53 +0200
Subject: [PATCH] remove rebase markings

---
 data/datamysql/datamysql.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/data/datamysql/datamysql.go b/data/datamysql/datamysql.go
index 9c5d30d..d57838d 100644
--- 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