wanyong:

metadata/com/kingdee/eas/hr/project/app/CT_PRO_ProjectManagementEntry.table

@@ -72,7 +72,6 @@
         <indexID>0</indexID>
         <sortType>ASC</sortType>
         <column>
-<<<<<<< HEAD
             <name>FParentID</name>
             <alias>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagementEntry].columns.column[FParentID].alias</alias>
             <description>dataTable[com.kingdee.eas.hr.project.app.CT_PRO_ProjectManagementEntry].columns.column[FParentID].description</description>
@@ -222,7 +221,6 @@
             <lang locale="zh_TW" value="null" />
         </rs>
     </resource>
-=======
           <key name="name" value="FID" />
         </column>
       </primaryKeyColumn>
@@ -308,5 +306,4 @@
       <lang locale="zh_TW" value="null" />
     </rs>
   </resource>
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
 </dataTable>

metadata/com/kingdee/eas/hr/project/app/ProjectManagementEntry.entity

@@ -189,7 +189,6 @@
       </mappingField>
       <relationship>
         <key name="package" value="com.kingdee.eas.hr.project.app" />
-<<<<<<< HEAD
         <key name="name" value="CT_PRO_ProjectManagementEntry" />
     </table>
     <properties>
@@ -423,7 +422,6 @@
             <lang locale="zh_TW" value="true" />
         </rs>
     </resource>
-=======
         <key name="name" value="R_ProjectManagement_ProjectManagementEntry_entrys" />
       </relationship>
     </linkProperty>
@@ -648,5 +646,4 @@
       <lang locale="zh_TW" value="true" />
     </rs>
   </resource>
->>>>>>> 720e502ee84f7cbcf88f683c47d9737d4cfeb633
 </entityObject>