Commits

Anonymous committed 2c84701

#i10000#

Comments (0)

Files changed (1)

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

 	$(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)\
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.