From 8fd784413142999a312d5300a1654a526b61b260 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 10 Dec 2013 22:36:57 +0100
Subject: Fix gone wrong rebase

---
 src/de/blinkt/openvpn/fragments/LogFragment.java | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/de')

diff --git a/src/de/blinkt/openvpn/fragments/LogFragment.java b/src/de/blinkt/openvpn/fragments/LogFragment.java
index c289580c..246d8f3d 100644
--- a/src/de/blinkt/openvpn/fragments/LogFragment.java
+++ b/src/de/blinkt/openvpn/fragments/LogFragment.java
@@ -615,8 +615,6 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
     }
 
     @Override
-<<<<<<< mine
-=======
     public void onAttach(Activity activity) {
         super.onAttach(activity);
         if(getResources().getBoolean(R.bool.logSildersAlwaysVisible)) {
@@ -627,7 +625,6 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
     }
 
     @Override
->>>>>>> theirs
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-- 
cgit v1.2.3