| Chunk |
|---|
| Conflicting content |
|---|
/** <<<<<<< HEAD * Copyright (c) 2005-2013 by Appcelerator, Inc. All Rights Reserved. ======= * Copyright (c) 2005-2012 by Appcelerator, Inc. All Rights Reserved. >>>>>>> 6ee23ee3d171e935b05c0b56b489d50f0a2685e1 * Licensed under the terms of the Eclipse Public License (EPL). * Please see the license.txt included with this distribution for details. * Any modifications to this file must keep this entire header intact. |
| Solution content |
|---|
/** * Copyright (c) 2005-2013 by Appcelerator, Inc. All Rights Reserved. * Licensed under the terms of the Eclipse Public License (EPL). * Please see the license.txt included with this distribution for details. * Any modifications to this file must keep this entire header intact. |
| File |
|---|
| PythonBreakpointPropertiesRulerAction.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |