Projects >> MyExpenses >>6833a31eb53634a38108c532a37a609c2b96c7fe

Chunk
Conflicting content 
    public static String PREFKEY_UI_FONTSIZE;
    public static String PREFKEY_BACKUP;
    public static String PREFKEY_RESTORE;
<<<<<<< HEAD
    public static String PREFKEY_CONTRIB_INSTALL;
=======
    public static String PREFKEY_RESTORE_LEGACY;
    public static String PREFKEY_CONTRIB_DONATE;
>>>>>>> 7f59861a6545bf50660ebec25367db90381264ed
    public static String PREFKEY_REQUEST_LICENCE;
    public static String PREFKEY_ENTER_LICENCE;
    public static String PREFKEY_PERFORM_PROTECTION;
Solution content 
    public static String PREFKEY_UI_FONTSIZE;
    public static String PREFKEY_BACKUP;
    public static String PREFKEY_RESTORE;
    public static String PREFKEY_RESTORE_LEGACY;  
    public static String PREFKEY_CONTRIB_INSTALL;
    public static String PREFKEY_REQUEST_LICENCE;
    public static String PREFKEY_ENTER_LICENCE;
    public static String PREFKEY_PERFORM_PROTECTION;
File
MyApplication.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
      PREFKEY_UI_FONTSIZE = getString(R.string.pref_ui_fontsize_key);
      PREFKEY_BACKUP = getString(R.string.pref_backup_key);
      PREFKEY_RESTORE = getString(R.string.pref_restore_key);
<<<<<<< HEAD
      PREFKEY_CONTRIB_INSTALL = getString(R.string.pref_contrib_install_key);
=======
      PREFKEY_RESTORE_LEGACY = getString(R.string.pref_restore_legacy_key);
      PREFKEY_CONTRIB_DONATE = getString(R.string.pref_contrib_donate_key);
>>>>>>> 7f59861a6545bf50660ebec25367db90381264ed
      PREFKEY_REQUEST_LICENCE = getString(R.string.pref_request_licence_key);
      PREFKEY_ENTER_LICENCE = getString(R.string.pref_enter_licence_key);
      PREFKEY_PERFORM_PROTECTION = getString(R.string.pref_perform_protection_key);
Solution content 
      PREFKEY_UI_FONTSIZE = getString(R.string.pref_ui_fontsize_key);
      PREFKEY_BACKUP = getString(R.string.pref_backup_key);
      PREFKEY_RESTORE = getString(R.string.pref_restore_key);
      PREFKEY_RESTORE_LEGACY = getString(R.string.pref_restore_legacy_key);
      PREFKEY_CONTRIB_INSTALL = getString(R.string.pref_contrib_install_key);
      PREFKEY_REQUEST_LICENCE = getString(R.string.pref_request_licence_key);
      PREFKEY_ENTER_LICENCE = getString(R.string.pref_enter_licence_key);
      PREFKEY_PERFORM_PROTECTION = getString(R.string.pref_perform_protection_key);
File
MyApplication.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation