From 72a1c9b9bdc70586bc9e56801c54ba1249ddf1ec Mon Sep 17 00:00:00 2001
From: Anton Ignatov <aignatov@biosistemika.com>
Date: Tue, 7 May 2019 13:27:57 +0200
Subject: [PATCH] Fix merge conflict

---
 Gemfile.lock | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 21834e26a..c1256a4b9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -211,19 +211,11 @@ GEM
     diff-lcs (1.3)
     discard (1.0.0)
       activerecord (>= 4.2, < 6)
-<<<<<<< HEAD
-    docile (1.1.5)
-    doorkeeper (5.0.0)
-      railties (>= 4.2)
-    erubi (1.8.0)
-    et-orbi (1.1.7)
-=======
     docile (1.3.1)
     doorkeeper (5.1.0)
       railties (>= 5)
     erubi (1.8.0)
     et-orbi (1.2.0)
->>>>>>> master
       tzinfo
     execjs (2.7.0)
     factory_bot (4.8.2)
@@ -375,11 +367,7 @@ GEM
     puma (3.12.1)
     raabro (1.1.6)
     rack (2.0.7)
-<<<<<<< HEAD
-    rack-attack (5.4.1)
-=======
     rack-attack (6.0.0)
->>>>>>> master
       rack (>= 1.0, < 3)
     rack-proxy (0.6.5)
       rack