| Chunk |
|---|
| Conflicting content |
|---|
+ (avoidResliceInterpolation?AVOID_RESLICE_INTERPOLATION:0) + (keepUndoBuffers?KEEP_UNDO_BUFFERS:0); prefs.put(OPTIONS, Integer.toString(options)); <<<<<<< HEAD if (enableRMIListener >= 0) prefs.put(ENABLE_RMI, Integer.toString(enableRMIListener)); int options2 = (useSystemProxies?USE_SYSTEM_PROXIES:0); ======= int options2 = (useSystemProxies?USE_SYSTEM_PROXIES:0) + (useFileChooser?USE_FILE_CHOOSER:0); >>>>>>> fc33df204ed457d540fae5944c1c7c58be673ad8 prefs.put(OPTIONS2, Integer.toString(options2)); } |
| Solution content |
|---|
+ (avoidResliceInterpolation?AVOID_RESLICE_INTERPOLATION:0) + (keepUndoBuffers?KEEP_UNDO_BUFFERS:0); prefs.put(OPTIONS, Integer.toString(options)); if (enableRMIListener >= 0) prefs.put(ENABLE_RMI, Integer.toString(enableRMIListener)); int options2 = (useSystemProxies?USE_SYSTEM_PROXIES:0) + (useFileChooser?USE_FILE_CHOOSER:0); prefs.put(OPTIONS2, Integer.toString(options2)); } |
| File |
|---|
| Prefs.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| If statement |
| Variable |