@@ -1172,7 +1172,6 @@ public TokenResponse forService(String service) {
         }
 
         /**
-         * >>>>>>> 6379975 (Store token into caffeine cache (#631))
          * Get the effective token
          * @return The effective token, which is either the access_token or the token field depending on which one is present
          */
Original file line number	Diff line number	Diff line change
`@@ -1172,7 +1172,6 @@ public TokenResponse forService(String service) {`
`1172`	`1172`	`}`
`1173`	`1173`
`1174`	`1174`	`/**`
`1175`		`- * >>>>>>> 6379975 (Store token into caffeine cache (#631))`
`1176`	`1175`	`* Get the effective token`
`1177`	`1176`	`* @return The effective token, which is either the access_token or the token field depending on which one is present`
`1178`	`1177`	`*/`