Resolve conflict in spec/services/quick_actions/interpret_service_spec.rb

6ff1a18d · Toon Claes · 9dcb52fa · 6ff1a18d
Commit 6ff1a18d authored Sep 28, 2018 by Toon Claes
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

spec/services/quick_actions/interpret_service_spec.rb spec/services/quick_actions/interpret_service_spec.rb +0 -3

No files found.
--- a/spec/services/quick_actions/interpret_service_spec.rb
+++ b/spec/services/quick_actions/interpret_service_spec.rb
-<<<<<<< HEAD
 # coding: utf-8
-=======
 # frozen_string_literal: true
->>>>>>> upstream/master
 require 'spec_helper'
 describe QuickActions::InterpretService do