None
adminRemoving vendor/assets/javascripts/leaflet-pip.js Auto-merging test/test_helper.rb Removing docker/rails.env Removing docker/mapotempo.rb Removing docker/docker-compose.yml Removing docker/db.env Auto-merging config/locales/he.yml CONFLICT (content): Merge conflict in config/locales/he.yml Auto-merging config/application.rb CONFLICT (content): Merge conflict in config/application.rb Auto-merging app/controllers/plannings_controller.rb CONFLICT (content): Merge conflict in app/controllers/plannings_controller.rb Removing app/assets/javascripts/leaflet.draw.i18n.js Auto-merging app/assets/javascripts/destinations.js Auto-merging app/assets/javascripts/application.js CONFLICT (content): Merge conflict in app/assets/javascripts/application.js Auto-merging .travis.yml CONFLICT (content): Merge conflict in .travis.yml Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago
Removing vendor/assets/javascripts/leaflet-pip.js Auto-merging test/test_helper.rb Removing docker/rails.env Removing docker/mapotempo.rb Removing docker/docker-compose.yml Removing docker/db.env Auto-merging config/locales/he.yml CONFLICT (content): Merge conflict in config/locales/he.yml Auto-merging config/application.rb CONFLICT (content): Merge conflict in config/application.rb Auto-merging app/controllers/plannings_controller.rb CONFLICT (content): Merge conflict in app/controllers/plannings_controller.rb Removing app/assets/javascripts/leaflet.draw.i18n.js Auto-merging app/assets/javascripts/destinations.js Auto-merging app/assets/javascripts/application.js CONFLICT (content): Merge conflict in app/assets/javascripts/application.js Auto-merging .travis.yml CONFLICT (content): Merge conflict in .travis.yml Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago
Removing vendor/assets/javascripts/leaflet-pip.js Auto-merging test/test_helper.rb Removing docker/rails.env Removing docker/mapotempo.rb Removing docker/docker-compose.yml Removing docker/db.env Auto-merging config/locales/he.yml CONFLICT (content): Merge conflict in config/locales/he.yml Auto-merging config/application.rb CONFLICT (content): Merge conflict in config/application.rb Auto-merging app/controllers/plannings_controller.rb CONFLICT (content): Merge conflict in app/controllers/plannings_controller.rb Removing app/assets/javascripts/leaflet.draw.i18n.js Auto-merging app/assets/javascripts/destinations.js Auto-merging app/assets/javascripts/application.js CONFLICT (content): Merge conflict in app/assets/javascripts/application.js Auto-merging .travis.yml CONFLICT (content): Merge conflict in .travis.yml Automatic merge failed; fix conflicts and then commit the result. (1)6 years ago
inbalwieselAuto-merging config/locales/he.yml CONFLICT (content): Merge conflict in config/locales/he.yml Auto-merging app/controllers/plannings_controller.rb CONFLICT (content): Merge conflict in app/controllers/plannings_controller.rb Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago