summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/de/blinkt/openvpn/fragments/LogFragment.java3
1 files changed, 0 insertions, 3 deletions
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);