aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXinhui2016-11-10 10:48:09 +0100
committerXinhui2016-11-10 10:48:09 +0100
commit07930de6d68c509f8e357c12a290e9fcb9e90eef (patch)
tree21c06342b5bc17a4c74301e952c444304cee5452
parentfd0eb812fedb60f7dfc51acf26dc94eb9b972cba (diff)
downloadchouette-core-07930de6d68c509f8e357c12a290e9fcb9e90eef.tar.bz2
Gem reflex switch back to branch master
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock1
2 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index aab237513..d02d91b20 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,7 +56,7 @@ gem 'polylines'
# Codifligne API
gem 'codifligne', git: 'git@github.com:AF83/stif-codifline-api.git'
# Reflex API
-gem 'reflex', git: 'git@github.com:AF83/stif-reflex-api.git', branch: 'sax_refactoring'
+gem 'reflex', git: 'git@github.com:AF83/stif-reflex-api.git'
# Authentication
gem 'devise', '~> 3.4.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index a3ede77d1..b9240249b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,7 +24,6 @@ GIT
GIT
remote: git@github.com:AF83/stif-reflex-api.git
revision: 2c01010dce3a6cb39339995c373faf89ae00f3f3
- branch: sax_refactoring
specs:
reflex (0.0.1)
nokogiri (~> 1.6)