From af32db82732060fe5a309977afdb648aa9a62212 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 23 Sep 2016 16:47:01 +0200
Subject: Fixed typo in helper

---
 app/helpers/twitter_helper.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 9b1d78d..f520286 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,7 +22,6 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-<<<<<<< HEAD
     twitter_user_info[2] = twitter_client.user_timeline(twitter_handle, {:count => 200}).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
     if twitter_user_info[2] == nil
       error_handling
-- 
cgit v1.2.3