Resolve conflict in lib/rspec_flaky/flaky_examples_collection.rb

6fdc6ee7 · Rémy Coutable · 40deb286 · 6fdc6ee7
Commit 6fdc6ee7 authored Apr 11, 2018 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/rspec_flaky/flaky_examples_collection.rb lib/rspec_flaky/flaky_examples_collection.rb +0 -3

No files found.
--- a/lib/rspec_flaky/flaky_examples_collection.rb
+++ b/lib/rspec_flaky/flaky_examples_collection.rb
 require 'active_support/hash_with_indifferent_access'
-<<<<<<< HEAD
-=======

 require_relative 'flaky_example'
->>>>>>> upstream/master

 module RspecFlaky
  class FlakyExamplesCollection < SimpleDelegator