superuser ca797b8d9c update conflict file

2017-07-02 14:37:21 +06:30

..

environments

…

initializers

…

locales

…

.database.yml.swp

before pull

2017-06-30 14:19:30 +06:30

application.rb

merge with crm

2017-06-29 13:40:30 +06:30

boot.rb

…

cable.yml

…

database.yml.sample

…

environment.rb

…

puma.rb

…

puma.rb.production

…

puma.rb.save

…

routes.rb

update shift close print

2017-07-01 20:05:26 +06:30

schedule.rb

crong job and close cashier

2017-07-02 09:37:19 +06:30

secrets.yml

…

sidekiq.yml

…

spring.rb

…