| Chunk |
|---|
| Conflicting content |
|---|
public void configure() throws CoreException
{
<<<<<<< HEAD
addToBuildSpec(PHPEditorPlugin.BUILDER_ID);
=======
addToBuildSpec(PHPEditorPlugin.BUILDER_ID);
>>>>>>> 1e0ce9f73f23d4fd15b486812f7ec2739d541fd7
}
public void deconfigure() throws CoreException |
| Solution content |
|---|
public void configure() throws CoreException
{
addToBuildSpec(PHPEditorPlugin.BUILDER_ID);
}
public void deconfigure() throws CoreException |
| File |
|---|
| PHPNature.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
public void deconfigure() throws CoreException
{
<<<<<<< HEAD
removeFromBuildSpec(PHPEditorPlugin.BUILDER_ID);
=======
removeFromBuildSpec(PHPEditorPlugin.BUILDER_ID);
>>>>>>> 1e0ce9f73f23d4fd15b486812f7ec2739d541fd7
}
public IProject getProject() |
| Solution content |
|---|
public void deconfigure() throws CoreException
{
removeFromBuildSpec(PHPEditorPlugin.BUILDER_ID);
}
public IProject getProject() |
| File |
|---|
| PHPNature.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |