From f8e860fac1e8cdbd56730da250420fafdf4eea92 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 8 Nov 2012 14:03:14 +0100 Subject: [PATCH] Removed .mergesources.yml, not used since the dark SVN days --- .mergesources.yml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .mergesources.yml diff --git a/.mergesources.yml b/.mergesources.yml deleted file mode 100644 index bc71aae..0000000 --- a/.mergesources.yml +++ /dev/null @@ -1,8 +0,0 @@ -# Data source for the "arb" svn merge tool (see http://github.com/sminnee/arborist). -# Keeps track of all opensource branches of submodules -# that could be merged back to the current submodule paths. -trunk: - .: /open/phpinstaller/trunk - sapphire: /open/modules/sapphire/trunk - cms: /open/modules/cms/trunk - jsparty: /open/modules/jsparty/trunk \ No newline at end of file