Commit ca37ec291afab7ec0c547723368e48d5b83889cb
1 parent
5af09f5a
Exists in
master
and in
1 other branch
Removed merge conflict artifact
Showing
1 changed file
with
0 additions
and
1 deletions
Show diff stats
Gemfile
| @@ -47,7 +47,6 @@ gem 'bitbucket_rest_api' | @@ -47,7 +47,6 @@ gem 'bitbucket_rest_api' | ||
| 47 | gem 'campy' | 47 | gem 'campy' |
| 48 | # Hipchat | 48 | # Hipchat |
| 49 | gem 'hipchat' | 49 | gem 'hipchat' |
| 50 | -<<<<<<< HEAD | ||
| 51 | # Hoiio (SMS) | 50 | # Hoiio (SMS) |
| 52 | gem 'hoi' | 51 | gem 'hoi' |
| 53 | # Pushover (iOS Push notifications) | 52 | # Pushover (iOS Push notifications) |