Removed merge conflict artifact

Nathan Broadbent
1 parent 5af09f5a
Showing 1 changed file with 0 additions and 1 deletions Show diff stats
Gemfile
@@ -47,7 +47,6 @@ gem &#39;bitbucket_rest_api&#39;
 gem 'campy'
 # Hipchat
 gem 'hipchat'
-<<<<<<< HEAD
 # Hoiio (SMS)
 gem 'hoi'
 # Pushover (iOS Push notifications)
...	...	@@ -47,7 +47,6 @@ gem 'bitbucket_rest_api'
47	47	gem 'campy'
48	48	# Hipchat
49	49	gem 'hipchat'
50		-<<<<<<< HEAD
51	50	# Hoiio (SMS)
52	51	gem 'hoi'
53	52	# Pushover (iOS Push notifications)
...	...