Missed a merge

2 months ago · d946709ec5
1 changed files with 0 additions and 4 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -240,11 +240,7 @@ GEM
      ruby-progressbar (~> 1.4)
    globalid (0.4.2)
      activesupport (>= 4.2.0)
-<<<<<<< HEAD
-    hamlit (2.11.0)
-=======
    hamlit (2.13.0)
->>>>>>> v3.3.0
      temple (>= 0.8.2)
      thor
      tilt