Skip to content

Commit 13ecae7

Browse files
author
sofia
committed
Revert previous changes after unintentendly merging to master
1 parent ee70f76 commit 13ecae7

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

lib/intercom/errors.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,7 @@ class ServiceConnectionError < IntercomError; end
4141

4242
# Raised when requesting resources on behalf of a user that doesn't exist in your application on Intercom.
4343
class ResourceNotFound < IntercomError; end
44-
45-
# Raised when trying to create a resource that already exists in Intercom.
46-
class ResourceNotUniqueError < IntercomError; end
47-
44+
4845
# Raised when the request has bad syntax
4946
class BadRequestError < IntercomError; end
5047

lib/intercom/request.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ def raise_application_errors_on_failure(error_list_details, http_code)
163163
raise Intercom::ServiceUnavailableError.new(error_details['message'], error_context)
164164
when 'conflict', 'unique_user_constraint'
165165
raise Intercom::MultipleMatchingUsersError.new(error_details['message'], error_context)
166-
when 'resource_conflict'
167-
raise Intercom::ResourceNotUniqueError.new(error_details['message'], error_context)
168166
when nil, ''
169167
raise Intercom::UnexpectedError.new(message_for_unexpected_error_without_type(error_details, parsed_http_code), error_context)
170168
else

0 commit comments

Comments
 (0)