fix conflit

2017-08-29 18:42:08 +06:30
parent f03d8654e7 e84c080552
commit 5fcfbdc020
16 changed files with 2965 additions and 15 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,6 +5,15 @@ GIT
    momentjs-rails (2.17.1)
      railties (>= 3.1)

+GIT
+  remote: https://github.com/zpaulovics/datetimepicker-rails.git
+  revision: 36d21cec5da7f5b214925804f60e63c61c747023
+  branch: master
+  submodules: true
+  specs:
+    datetimepicker-rails (4.7.16)
+      momentjs-rails (>= 2.9.0)
+
 GEM
  remote: https://rubygems.org/
  specs:
@@ -277,6 +286,7 @@ DEPENDENCIES
  coffee-rails (~> 4.2)
  cups (~> 0.0.7)
  database_cleaner
+  datetimepicker-rails!
  factory_girl_rails (~> 4.0)
  faker
  filterrific