From cbcd4317724a545802013aafdb000883e884f052 Mon Sep 17 00:00:00 2001
From: Fernando Arias <fernando_arias@rapid7.com>
Date: Fri, 26 Feb 2016 15:41:39 -0600
Subject: [PATCH] Updated Gemfile.lock

---
 Gemfile.lock | 42 ++++++++++--------------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0aa8a5f3d4..b080f4eedd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,43 +1,40 @@
 GIT
-<<<<<<< HEAD
-  remote: https://github.com/rapid7/metasploit-concern.git
-  revision: cf2dbfc0cf0b60c9561357d00de4ece34058e13b
-  branch: staging/MS-888/engines-is-deprecated
-  specs:
-    metasploit-concern (1.0.1.pre.engines.pre.is.pre.deprecated)
-=======
   remote: https://github.com/rapid7/metasploit-concern
-  revision: ef10168eea90af393f595d426aadb5ca33dfe031
+  revision: b496de4ffc1b2572832333459e617d5eaa946dc5
   branch: staging/rails-upgrade
   specs:
     metasploit-concern (1.0.1.pre.rails.pre.upgrade)
->>>>>>> staging/rails-upgrade
       activerecord (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
       railties (>= 4.0.9, < 4.1.0)
 
-<<<<<<< HEAD
-=======
 GIT
   remote: https://github.com/rapid7/metasploit-credential
   revision: 9aa0cf5812fc7bc27c25e122c9648ffc5798735d
   branch: staging/rails-upgrade
   specs:
     metasploit-credential (2.0.0.pre.rails.pre.upgrade)
+      activerecord (>= 4.0.9, < 4.1.0)
+      activesupport (>= 4.0.9, < 4.1.0)
+      arel-helpers
       metasploit-concern
+      metasploit-concern (~> 1.0)
       metasploit-model (~> 1.0)
       metasploit_data_models
       pg
+      postgres_ext
+      railties (>= 4.0.9, < 4.1.0)
       railties
+      recog (~> 2.0)
       rubyntlm
       rubyzip (~> 1.1)
 
 GIT
   remote: https://github.com/rapid7/metasploit_data_models
-  revision: 97197d0955936ee2f0881dd262951dfc667b905b
+  revision: aadb1f7e461f7f06ca992331a553a1e7f82894a9
   branch: staging/rails-upgrade
   specs:
-    metasploit_data_models (2.0.0.pre.rails.pre.upgrade)
+    metasploit_data_models (2.0.0.pre.rails.pre.4.pre.deprecations)
       activerecord (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
       arel-helpers
@@ -48,7 +45,6 @@ GIT
       railties (>= 4.0.9, < 4.1.0)
       recog (~> 2.0)
 
->>>>>>> staging/rails-upgrade
 PATH
   remote: .
   specs:
@@ -61,11 +57,7 @@ PATH
       jsobfu (~> 0.4.1)
       json
       metasm (~> 1.0.2)
-<<<<<<< HEAD
       metasploit-concern
-      metasploit-credential (= 1.0.1)
-=======
->>>>>>> staging/rails-upgrade
       metasploit-model (= 1.0.0)
       metasploit-payloads (= 1.1.0)
       msgpack
@@ -161,17 +153,6 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     metasm (1.0.2)
-<<<<<<< HEAD
-    metasploit-credential (1.0.1)
-      metasploit-concern (~> 1.0)
-      metasploit-model (~> 1.0)
-      metasploit_data_models (~> 1.0)
-      pg
-      railties
-      rubyntlm
-      rubyzip (~> 1.1)
-=======
->>>>>>> staging/rails-upgrade
     metasploit-model (1.0.0)
       activemodel (>= 4.0.9, < 4.1.0)
       activesupport (>= 4.0.9, < 4.1.0)
@@ -280,10 +261,7 @@ DEPENDENCIES
   factory_girl_rails (~> 4.5.0)
   fivemat (~> 1.3.1)
   metasploit-concern!
-<<<<<<< HEAD
-=======
   metasploit-credential!
->>>>>>> staging/rails-upgrade
   metasploit-framework!
   metasploit_data_models!
   pry