diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-12-10 22:36:57 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-12-10 22:36:57 +0100 |
| commit | 8fd784413142999a312d5300a1654a526b61b260 (patch) | |
| tree | e2dd24e952ada2754be8840abb59d4c81d7e23f8 /src/de/blinkt | |
| parent | 08eb0e7ef5b3e19d2b5768ab9a05003ad41f9cfc (diff) | |
Fix gone wrong rebase
Diffstat (limited to 'src/de/blinkt')
| -rw-r--r-- | src/de/blinkt/openvpn/fragments/LogFragment.java | 3 |
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); |