Merge Conflict

.metadata/.log

@@ -4115,6 +4115,7 @@ Command-line arguments:  -os macosx -ws cocoa -arch x86 -product org.eclipse.epp
 
 !ENTRY org.eclipse.ui 4 4 2014-04-16 20:31:38.989
 !MESSAGE Unable to find Action Set: com_sysdeo_eclipse_tomcat_actionSet
+<<<<<<< HEAD
 !SESSION 2014-04-16 20:49:24.715 -----------------------------------------------
 eclipse.buildId=4.3.0.I20130605-2000
 java.version=1.7.0_51
@@ -4164,3 +4165,49 @@ user global configuration and to define the default location to store repositori
 not correct please set the HOME environment variable and restart Eclipse. Otherwise Git for Windows and
 EGit might behave differently since they see different configuration options.
 This warning can be switched off on the Team > Git > Confirmations and Warnings preference page.
+=======
+!SESSION 2014-04-16 20:39:47.283 -----------------------------------------------
+eclipse.buildId=4.3.0.M20130911-1000
+java.version=1.6.0_65
+java.vendor=Apple Inc.
+BootLoader constants: OS=macosx, ARCH=x86, WS=cocoa, NL=en_US
+Framework arguments:  -product org.eclipse.epp.package.standard.product -keyring /Users/siyulin/.eclipse_keyring -showlocation
+Command-line arguments:  -os macosx -ws cocoa -arch x86 -product org.eclipse.epp.package.standard.product -keyring /Users/siyulin/.eclipse_keyring -showlocation
+
+!ENTRY org.eclipse.core.net 1 0 2014-04-16 20:39:51.759
+!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences
+
+!ENTRY org.eclipse.ui 4 4 2014-04-16 20:39:52.364
+!MESSAGE Unable to find Action Set: org.eclipse.ptp.debug.ui.debugActionSet
+
+!ENTRY org.eclipse.ui 4 4 2014-04-16 20:39:52.364
+!MESSAGE Unable to find Action Set: org.eclipse.rse.core.search.searchActionSet
+
+!ENTRY org.eclipse.ui 4 4 2014-04-16 20:39:52.364
+!MESSAGE Unable to find Action Set: org.eclipse.wb.core.ui.actionset
+
+!ENTRY org.eclipse.ui 4 4 2014-04-16 20:39:52.364
+!MESSAGE Unable to find Action Set: com_sysdeo_eclipse_tomcat_actionSet
+!SESSION 2014-04-16 22:26:58.968 -----------------------------------------------
+eclipse.buildId=4.3.0.M20130911-1000
+java.version=1.6.0_65
+java.vendor=Apple Inc.
+BootLoader constants: OS=macosx, ARCH=x86, WS=cocoa, NL=en_US
+Framework arguments:  -product org.eclipse.epp.package.standard.product -keyring /Users/siyulin/.eclipse_keyring -showlocation
+Command-line arguments:  -os macosx -ws cocoa -arch x86 -product org.eclipse.epp.package.standard.product -keyring /Users/siyulin/.eclipse_keyring -showlocation
+
+!ENTRY org.eclipse.core.net 1 0 2014-04-16 22:27:07.154
+!MESSAGE System property http.nonProxyHosts has been set to local|*.local|169.254/16|*.169.254/16 by an external source. This value will be overwritten using the values from the preferences
+
+!ENTRY org.eclipse.ui 4 4 2014-04-16 22:27:07.830
+!MESSAGE Unable to find Action Set: org.eclipse.ptp.debug.ui.debugActionSet
+
+!ENTRY org.eclipse.ui 4 4 2014-04-16 22:27:07.830
+!MESSAGE Unable to find Action Set: org.eclipse.rse.core.search.searchActionSet
+
+!ENTRY org.eclipse.ui 4 4 2014-04-16 22:27:07.830
+!MESSAGE Unable to find Action Set: org.eclipse.wb.core.ui.actionset
+
+!ENTRY org.eclipse.ui 4 4 2014-04-16 22:27:07.830
+!MESSAGE Unable to find Action Set: com_sysdeo_eclipse_tomcat_actionSet
+>>>>>>> 3fe4ee042c3543527ba5af94f99d0c20adde0dee

.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

+<<<<<<< HEAD
 INDEX VERSION 1.126+S:\cs227\workspace\.metadata\.plugins\org.eclipse.jdt.core
 4041092966.index
 2534750255.index
@@ -25,3 +26,54 @@ INDEX VERSION 1.126+S:\cs227\workspace\.metadata\.plugins\org.eclipse.jdt.core
 3974580528.index
 2852265749.index
 4155206848.index
+=======
+INDEX VERSION 1.126+/Users/siyulin/Library/Eclipse/workspace/.metadata/.plugins/org.eclipse.jdt.core
+1213662472.index
+1783161122.index
+4096554113.index
+2219212814.index
+1819685514.index
+1375964667.index
+2399042292.index
+1554391649.index
+3321539481.index
+491770292.index
+3266567714.index
+3204920947.index
+4238209716.index
+1271342938.index
+4081168536.index
+3302703152.index
+2322496549.index
+2220222405.index
+438441389.index
+777774250.index
+925495247.index
+1677634825.index
+4121012013.index
+2887900387.index
+3394953001.index
+1104227807.index
+2821668023.index
+3513380958.index
+2200650775.index
+1895420617.index
+3402582055.index
+1833648217.index
+3037559739.index
+3403394679.index
+4249090055.index
+2907606161.index
+713861701.index
+267658943.index
+156905802.index
+1384487945.index
+3712507179.index
+2982917733.index
+1628143439.index
+2545238116.index
+2124630112.index
+3261838026.index
+2328043753.index
+1060078548.index
+>>>>>>> 3fe4ee042c3543527ba5af94f99d0c20adde0dee