summaryrefslogtreecommitdiff
path: root/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/tlpsrc/bin-texlive.tlpsrc')
-rw-r--r--Master/tlpkg/tlpsrc/bin-texlive.tlpsrc4
1 files changed, 4 insertions, 0 deletions
diff --git a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
index 560e80102e4..c185a706f5e 100644
--- a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
@@ -8,7 +8,11 @@ depend texlive.infra
runpattern f texmf/fmtutil/fmtutil-hdr.cnf
runpattern d texmf/scripts/texlive/lua
runpattern d texmf/scripts/texlive/tlmgrgui
+<<<<<<< .mine
+runpattern !f texmf/scripts/texlive/tlmgrui/tlmgrgui2.pl
+=======
runpattern !f texmf/scripts/texlive/tlmgrgui/tlmgrgui2.pl
+>>>>>>> .r11548
runpattern f texmf/scripts/texlive/rungs.tlu
runpattern f texmf/scripts/texlive/test-tlpdb.tlu
runpattern f texmf/scripts/texlive/texconf.tlu