Resolve conflict in features/support/db_cleaner.rb

59aaec29 · Stan Hu · 4ebab4d9 · 59aaec29
Commit 59aaec29 authored Jan 24, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

features/support/db_cleaner.rb features/support/db_cleaner.rb +0 -4

No files found.
--- a/features/support/db_cleaner.rb
+++ b/features/support/db_cleaner.rb
 require 'database_cleaner'

-<<<<<<< HEAD
 DatabaseCleaner[:active_record].strategy = :deletion, { except: ['licenses'] }
-=======
-DatabaseCleaner[:active_record].strategy = :deletion
->>>>>>> upstream/master

 Spinach.hooks.before_scenario do
  DatabaseCleaner.start