chore: fix gemfile lock

avo-hq · Sep 29, 2020 · 2e0a7a6 · 2e0a7a6
1 parent 1292b47
commit 2e0a7a6
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,10 +2,7 @@ PATH
   remote: .
   specs:
     avo (0.1.15)
-<<<<<<< HEAD
-=======
       countries
->>>>>>> b8c34e635782c1454cbf93272c495327e6c4e2ed
       inline_svg
       kaminari
       rails (~> 6.0.2, >= 6.0.2.1)