resolved conflicts

Christian Huff · Christian Huff · commit eaee548433cd · 2012-12-04T10:32:07.000+01:00
diff --git a/src/main/java/org/scribe/model/Token.java b/src/main/java/org/scribe/model/Token.java
@@ -5,7 +5,7 @@
 
 /**
  * Represents an OAuth token (either request or access token) and its secret
- * 
+ *
  * @author Pablo Fernandez
  */
 public class Token implements Serializable {
diff --git a/src/main/java/org/scribe/oauth/OAuth10aServiceImpl.java b/src/main/java/org/scribe/oauth/OAuth10aServiceImpl.java
@@ -9,7 +9,7 @@
 
 /**
  * OAuth 1.0a implementation of {@link OAuthService}
- * 
+ *
  * @author Pablo Fernandez
  */
 public class OAuth10aServiceImpl implements OAuthService {
