[Pkg-nagios-changes] [pkg-icinga2] 02/04: Fix rules

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch ubuntu-noma
in repository pkg-icinga2.

commit 069453aa1f47b927b6ef4a8e56541af28a06b378
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Dec 1 22:40:15 2014 +0100

    Fix rules
---
 debian/rules | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1a5d740..9c05acf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,10 +36,6 @@ override_dh_auto_install:
 
 override_dh_install:
 	dh_install
-<<<<<<< HEAD
-=======
-	chmod +x debian/icinga2-common/usr/lib/icinga2/prepare-dirs
->>>>>>> master
 	# remove ido files from other packages
 	if [ -d debian/icinga2-common/ ]; then rm debian/icinga2-common/etc/icinga2/features-available/ido-*; fi
 	rm debian/icinga2-bin/usr/lib/*/icinga2/libdb_ido_*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git