commit eb475ea5a59316244f8b179d0a62e2005d306ce6
author Christopher Guindon <chris.guindon@eclipse.org> Wed Jun 11 10:16:14 2014 -0400
committer Christopher Guindon <chris.guindon@eclipse.org> Wed Jun 11 10:16:14 2014 -0400
tree bf98d2dbd1d08b4545a1a851b4d41f38b2722154
parent 69b0eeba8dca00d7455ac5ba8c218db3a36309ce
parent 18b42bf2546630268cc90d539c747bfca0d4cd65

Merge branch 'solstice'

Conflicts:
	.settings/org.eclipse.wst.common.project.facet.core.xml

.settings/org.eclipse.wst.common.project.facet.core.xml

diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index cd5af24..51ea29a 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
+<<<<<<< HEAD
+  <fixed facet="php.core.component"/>
+  <fixed facet="php.component"/>
+=======
   <fixed facet="php.component"/>
   <fixed facet="php.core.component"/>
+>>>>>>> refs/heads/solstice
   <installed facet="php.core.component" version="1"/>
   <installed facet="php.component" version="5.4"/>
 </faceted-project>