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.tlpsrc5
1 files changed, 1 insertions, 4 deletions
diff --git a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
index c185a706f5e..a94c21dc0e1 100644
--- a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
@@ -8,11 +8,8 @@ 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/tlmgrgui/gui-config2.pl
runpattern f texmf/scripts/texlive/rungs.tlu
runpattern f texmf/scripts/texlive/test-tlpdb.tlu
runpattern f texmf/scripts/texlive/texconf.tlu