Module: check_mk
Branch: master
Commit: 7d904ebb4ff0820f2e4476a133cd903451fe01e4
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d904ebb4ff082…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Oct 18 08:49:43 2016 +0200
Fixed wrong merge
---
tests/Makefile | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
index 8930019..03b00eb 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -29,7 +29,4 @@ setup:
beautifulsoup4 \
pytest-stepwise \
dill
- sudo apt-get install \
- python-lxml
->>>>>>> Added dill module to test setup
$(MAKE) -C pylint setup