summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-12-08 18:07:30 +0000
committerNorbert Preining <preining@logic.at>2008-12-08 18:07:30 +0000
commit70412be34c353c6202625f7dd5e3fd827594a989 (patch)
treed4528a60fd461f5b42919c2e6d760b93dcab0ad0 /Master
parent82a39c8e95e8f199d78ba92ed15db9d6477bb96d (diff)
also blacklist gui-config2.pl
git-svn-id: svn://tug.org/texlive/trunk@11556 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-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