senaduka/old-svijetlastrana
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

remove rebase markings

Browse Source
This commit is contained in:
GotPPay
2018-05-25 12:16:53 +02:00
parent d6301ebbf3
commit 924ddaded1
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/datamysql/datamysql.go
View File

@@ -122,10 +122,7 @@ func Instance(cfg *config.Config) (contract.DataManager, error) {
instance.profile = newProfileRepo(db) instance.profile = newProfileRepo(db)
instance.organization = newOrganizationRepo(db) instance.organization = newOrganizationRepo(db)
instance.zipcodes = newZipcodeRepo(db) instance.zipcodes = newZipcodeRepo(db)
<<<<<<< HEAD
instance.plan = newPlanRepo(db) instance.plan = newPlanRepo(db)
=======
>>>>>>> add datamodel ; check if zipcode is participating
}) })
return instance, connErr return instance, connErr