From 80f9a1404d6220e18682142a353845f31a23632f Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 11 Nov 2010 16:37:13 -0800
Subject: [PATCH] fixup

---
 .../integration/twitter/core/Twitter4jTemplate.java             | 2 --
 1 file changed, 2 deletions(-)

diff --git 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
index d9cdef7122..b8ea0b0999 100644
--- 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());