add datamodel ; check if zipcode is participating

2018-05-18 21:38:17 +02:00
parent 78d6a45ebb
commit d6301ebbf3
3 changed files with 4 additions and 4 deletions
--- a/data/datamysql/datamysql.go
+++ b/data/datamysql/datamysql.go
@@ -122,7 +122,10 @@ 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