| Chunk |
|---|
| Conflicting content |
|---|
package net.nightwhistler.pageturner; <<<<<<< HEAD import java.util.Collections; ======= import java.util.ArrayList; >>>>>>> 5f48a8230fde2267d8ddc8fd10c9d7a03025bc2e import java.util.List; import java.util.Locale; import java.util.Map; |
| Solution content |
|---|
package net.nightwhistler.pageturner; import java.util.Collections; import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; |
| File |
|---|
| Configuration.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
public static final String KEY_KEEP_SCREEN_ON = "keep_screen_on"; <<<<<<< HEAD public static final String KEY_OFFSETS = "offsets"; private static final String KEY_SHOW_PAGENUM = "show_pagenum"; ======= public static final String KEY_OFFSETS = "offsets"; public static final String KEY_SHOW_PAGENUM = "show_pagenum"; public static final String KEY_OPDS_SITES = "opds_sites"; >>>>>>> 5f48a8230fde2267d8ddc8fd10c9d7a03025bc2e private static final String KEY_NOOK_TOP_BUTTONS_DIRECTION = "nook_touch_top_buttons_direction"; |
| Solution content |
|---|
public static final String KEY_KEEP_SCREEN_ON = "keep_screen_on"; public static final String KEY_OFFSETS = "offsets"; public static final String KEY_SHOW_PAGENUM = "show_pagenum"; public static final String KEY_OPDS_SITES = "opds_sites"; private static final String KEY_NOOK_TOP_BUTTONS_DIRECTION = "nook_touch_top_buttons_direction"; |
| File |
|---|
| Configuration.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |