fixup

2010-11-11 16:37:13 -08:00
parent 0287f19fb7
commit 80f9a1404d
1 changed files with 0 additions and 2 deletions
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java
@@ -206,7 +206,6 @@ public class Twitter4jTemplate implements TwitterOperations {
 		return this.search(q);
 	}

-<<<<<<< HEAD
 	public Twitter getUnderlyingTwitter() {
 		return this.twitter;
 	}
@@ -260,7 +259,6 @@ public class Twitter4jTemplate implements TwitterOperations {
 		return tweet;
 	}

-<<<<<<< HEAD
 	private Tweet buildTweetFromStatus(Status status) {
 		Tweet tweet = new Tweet();
 		tweet.setCreatedAt(status.getCreatedAt());