fix conflict

devmiyax · Oct 12, 2020 · e6b6ae0 · e6b6ae0
1 parent 4ac202d
commit e6b6ae0
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/yabause/src/android/app/src/main/java/org/uoyabause/android/YabauseSettings.java b/yabause/src/android/app/src/main/java/org/uoyabause/android/YabauseSettings.java
@@ -656,11 +656,7 @@ private void SyncInputDeviceForPlayer2(){
         plyaer2_input_device.setEntryValues(input_entryValues_p2);
         plyaer2_input_device.setSummary(plyaer2_input_device.getEntry());
 
-<<<<<<< HEAD
-
-=======
 /*
->>>>>>> 169c6d25d... Yaba Sanshiro 2
         InputSettingPreference inputsetting= (InputSettingPreference)findPreference("pref_player2_inputdef_file");
         if( inputsetting != null ){
             try {
@@ -793,10 +789,5 @@ protected void onPause () {
     public void onDestroy() {
         super.onDestroy();
 
-<<<<<<< HEAD
-    }
-
-=======
         }
->>>>>>> 169c6d25d... Yaba Sanshiro 2
 }