Merge branch 'master' of https://github.com/OWASP/railsgoat

Conflicts: Gemfile.lock
2015-02-26 09:13:15 -05:00
parent 716a16d514 b2c8e6cf8d
commit 9e7eb02cde
5 changed files with 15 additions and 3 deletions
@@ -70,7 +70,12 @@ GEM
    coffee-script (2.3.0)
      coffee-script-source
      execjs
+<<<<<<< HEAD
    coffee-script-source (1.9.0)
+=======
+    coffee-script-source (1.8.0)
+    crack (0.3.1)
+>>>>>>> b2c8e6cf8dbbaf33b548b62aba99aa9512322da9
    cucumber (1.3.15)
      builder (>= 2.1.2)
      diff-lcs (>= 1.1.3)
@@ -308,6 +313,7 @@ DEPENDENCIES
  bundler-audit
  capybara
  coffee-rails
+  crack (= 0.3.1)
  database_cleaner
  execjs
  foreman