Merge conflict

queueit · Aug 31, 2017 · cba2fcb · cba2fcb
2 parents 4f91cc5 + 9375435
commit cba2fcb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -73,7 +73,8 @@ class ResourceController < ApplicationController
 				configJson,
 				customerId,
 				secretKey,
-				cookies
+				cookies,
+				request
 			)
 
 			if(validationResult.doRedirect)			

diff --git a/sdk/test/TestKnownUser.rb b/sdk/test/TestKnownUser.rb
@@ -839,4 +839,4 @@ def test_validateRequestByIntegrationConfig_CancelAction
 		assert( userInQueueService.validateCancelRequestCalls[0]["config"].cookieDomain == ".test.com" )
 		assert( userInQueueService.validateCancelRequestCalls[0]["config"].version == 3 )
 	end
-end
+end