fix(.gitignore): 余分な行を削除した (#161)

true-runes · Jan 7, 2021 · 9e41970 · 9e41970
1 parent 0043fbc
commit 9e41970
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,9 +26,7 @@ vendor/
 coverage/
 spec/tmp
 .rspec
-<<<<<<< HEAD
 start_unicorn.sh
-=======
 /public/packs
 /public/packs-test
 /node_modules