myeclipse项目 不能打开

重启电脑后， myeclipse项目 不能打开了， 之前都是好好的！！

出现：

Failed to read the project description file (.project) for 'LkStoreServer'. The file has been changed on disk, and it now contains invalid information. The project will not function properly until the description file is restored to a valid state.

原来E:\svn\LkStoreServer\trunk.project 从svn 更新后出了问题：

<?xml version="1.0" encoding="UTF-8"?>

LkStoreServer





<<<<<<< .mine
org.eclipse.wst.common.project.facet.core.builder




org.eclipse.wst.jsdt.core.javascriptValidator
=======
org.eclipse.wst.common.project.facet.core.builder

.r9597




org.eclipse.ui.externaltools.ExternalToolBuilder
full,incremental,


LaunchConfigHandle
<project>/.externalToolBuilders/org.eclipse.wst.jsdt.core.javascriptValidator.launch




com.genuitec.eclipse.j2eedt.core.WebClasspathBuilder




org.eclipse.jdt.core.javabuilder




com.genuitec.eclipse.j2eedt.core.J2EEProjectValidator




com.genuitec.eclipse.j2eedt.core.DeploymentDescriptorValidator




org.eclipse.wst.validation.validationbuilder




com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder




org.eclipse.wst.validation.validationbuilder




org.eclipse.wst.validation.validationbuilder




org.eclipse.wst.validation.validationbuilder





org.eclipse.jem.workbench.JavaEMFNature
com.genuitec.eclipse.ast.deploy.core.deploymentnature
com.genuitec.eclipse.j2eedt.core.webnature
org.eclipse.jdt.core.javanature
org.eclipse.wst.jsdt.core.jsNature
org.eclipse.wst.common.project.facet.core.nature
org.eclipse.wst.common.modulecore.ModuleCoreNature

修改回原来的 自己的文件 —— mime 即可，

或者参照 http://my.oschina.net/zhangjie830621/blog/140650 也可解决