Resolve conflicts in .gitignore

7d51283f · Stan Hu · 7fc4a7a2 · 7d51283f
Commit 7d51283f authored Jun 25, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

.gitignore .gitignore +0 -5

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -29,12 +29,7 @@ eslint-report.html
 /app/assets/javascripts/locale/**/app.js
 /backups/*
 /config/aws.yml
-<<<<<<< HEAD
-/config/database.yml
-/config/database_geo.yml
-=======
 /config/database*.yml
->>>>>>> upstream/master
 /config/gitlab.yml
 /config/gitlab_ci.yml
 /config/initializers/rack_attack.rb