Remove stray git merge artifact

dmitrizagidulin · dmitrizagidulin · commit 7d85c4e4db8c · 2016-05-31T11:21:38.000-04:00
diff --git a/lib/identity-provider.js b/lib/identity-provider.js
@@ -532,7 +532,6 @@ IdentityProvider.prototype.getGraph = function (uri, callback) {
 }
 
 /**
-<<<<<<< 6477d67eec3b591c4dd226307ff634c1a26e40c6
  * Sends a request to the OIDC Provider's Users API endpoint, to create a new
  * user record with the provider.
  * @method createOIDCUser

Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,6 @@ IdentityProvider.prototype.getGraph = function (uri, callback) {`
`532`	`532`	`}`
`533`	`533`
`534`	`534`	`/**`
`535`		`-<<<<<<< 6477d67eec3b591c4dd226307ff634c1a26e40c6`
`536`	`535`	`* Sends a request to the OIDC Provider's Users API endpoint, to create a new`
`537`	`536`	`* user record with the provider.`
`538`	`537`	`* @method createOIDCUser`