1. mst
  2. ooo340

Commits

vg  committed 2c84701

#i10000#

  • Participants
  • Parent commits 8dc158e
  • Branches default

Comments (0)

Files changed (1)

File setup_native/source/win32/customactions/shellextensions/makefile.mk

View file
 	$(SLO)$/layerlinks.obj \
 	$(SLO)$/dotnetcheck.obj \
 	$(SLO)$/registerextensions.obj \
-<<<<<<< .working
     $(SLO)$/copyeditiondata.obj \
     $(SLO)$/checkrunningoffice.obj \
-    $(SLO)$/checkpatches.obj
-=======
-    $(SLO)$/copyeditiondata.obj \
+    $(SLO)$/checkpatches.obj \
     $(SLO)$/copyextensiondata.obj
->>>>>>> .merge-right.r266571
 
 STDSHL += \
 	$(ADVAPI32LIB)\