Fixed merge conflicts with next-gen

src/controller/buffers/twitter/base.py

@@ -471,11 +471,18 @@ class BaseBuffer(base.Buffer):
 
     def onFocus(self, *args, **kwargs):
         tweet = self.get_tweet()
+<<<<<<< HEAD
         if self.session.settings["general"]["relative_times"] == True:
             # fix this:
             original_date = arrow.get(self.session.db[self.name][self.buffer.list.get_selected()].created_at, locale="en")
             ts = original_date.humanize(locale=languageHandler.getLanguage())
             self.buffer.list.list.SetItem(self.buffer.list.get_selected(), 2, ts)
+=======
+        # fix this:
+        original_date = arrow.get(self.session.db[self.name][self.buffer.list.get_selected()].created_at, locale="en")
+        ts = original_date.humanize(locale=languageHandler.getLanguage())
+        self.buffer.list.list.SetItem(self.buffer.list.get_selected(), 2, ts)
+>>>>>>> next-gen
         if self.session.settings['sound']['indicate_audio'] and utils.is_audio(tweet):
             self.session.sound.play("audio.ogg")
         if self.session.settings['sound']['indicate_geo'] and utils.is_geocoded(tweet):

src/controller/buffers/twitter/trends.py

@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 import time
-import platform
 import wx
+from wxUI import buffers, commonMessageDialogs, menus
+from controller import user, messages
+from controller import messages
 import widgetUtils
 import output
 import logging

src/controller/mainController.py

@@ -230,7 +230,7 @@ class Controller(object):
         self.set_systray_icon()
 
     def check_invisible_at_startup(self):
-        # Visibility check. It does only work for windows.
+        # Visibility check.
         if config.app["app-settings"]["hide_gui"] == True:
             self.show_hide()
             self.view.Show()