fixed conflict

312452e1 · Mai Hoang Thai Ha · c12a3114 · 312452e1
Commit 312452e1 authored Aug 11, 2021 by Mai Hoang Thai Ha
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Gemfile.lock
+0 -4

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -279,11 +279,7 @@ DEPENDENCIES
  mysql2 (~> 0.5)
  nokogiri (~> 1.11, >= 1.11.7)
  pry (~> 0.14.1)
-<<<<<<< HEAD
-  pry-rails (~> 0.3.9)
-=======
  pry-rails
->>>>>>> master
  puma (~> 5.0)
  rack-mini-profiler (~> 2.0)
  rails (~> 6.1.3, >= 6.1.3.2)