supernaturalflora/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml

<?xml version="1.0" encoding="UTF-8"?>
<workingSetManager>
<<<<<<< HEAD
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1433516553829_0" label="Window Working Set" name="Aggregate for window 1433516553827"/>
=======
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1426777548331_0" label="Window Working Set" name="Aggregate for window 1426777548317"/>
>>>>>>> e3b5f5f77f61b7a685fc1fc9109f8de395ab933d
</workingSetManager>
new computer update 2015-06-05 15:50:23 +00:00			`<?xml version="1.0" encoding="UTF-8"?>`
			`<workingSetManager>`
updates 2015-06-05 15:51:33 +00:00			`<<<<<<< HEAD`
new computer update 2015-06-05 15:50:23 +00:00			`<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1433516553829_0" label="Window Working Set" name="Aggregate for window 1433516553827"/>`
updates 2015-06-05 15:51:33 +00:00			`=======`
Added Spawn Egg Crafting Mechanic 2015-03-19 20:27:35 +00:00			`<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1426777548331_0" label="Window Working Set" name="Aggregate for window 1426777548317"/>`
updates 2015-06-05 15:51:33 +00:00			`>>>>>>> e3b5f5f77f61b7a685fc1fc9109f8de395ab933d`
new computer update 2015-06-05 15:50:23 +00:00			`</workingSetManager>`