summaryrefslogtreecommitdiff
path: root/without-test-modules
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-11-23 14:18:40 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-11-24 09:56:17 +0000
commitcbc3d789a4573704863de3a0247f55eda8b28638 (patch)
treed2ed4d405d2ca790826c4190b40c1699fbf4d46d /without-test-modules
parent822d5415edc61fafeb8709e27b6fb1a2ddd3b288 (diff)
downloadmorph-cbc3d789a4573704863de3a0247f55eda8b28638.tar.gz
Remove tests for branch-and-merge plugin
Change-Id: Ie66b543eb67282c08a2651062727a4583057ee2d
Diffstat (limited to 'without-test-modules')
-rw-r--r--without-test-modules1
1 files changed, 0 insertions, 1 deletions
diff --git a/without-test-modules b/without-test-modules
index 77803473..558cee7c 100644
--- a/without-test-modules
+++ b/without-test-modules
@@ -16,7 +16,6 @@ morphlib/plugins/syslinux-disk-systembuilder_plugin.py
morphlib/plugins/disk-systembuilder_plugin.py
morphlib/plugins/tarball-systembuilder_plugin.py
morphlib/plugins/show_dependencies_plugin.py
-morphlib/plugins/branch_and_merge_plugin.py
morphlib/buildcommand.py
morphlib/plugins/build_plugin.py
morphlib/gitversion.py