[Pkg-nagios-changes] [pkg-icinga2] 03/03: Update rules

[Alexander Wirt]

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

formorer pushed a commit to branch debmon-wheezy
in repository pkg-icinga2.

commit 6862c331dc1708eb1e56d10dec5fc6ffd0341549
Author: Alexander Wirt <formorer at debian.org>
Date:   Mon Jan 12 12:14:55 2015 +0100

    Update rules
---
 debian/rules | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index d434172..cfff01c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,10 +35,7 @@ override_dh_auto_install:
 
 override_dh_install:
 	dh_install
-<<<<<<< HEAD
-=======
 	if [ -d debian/icinga2-common/ ]; then chmod +x debian/icinga2-common/usr/lib/icinga2/prepare-dirs; fi
->>>>>>> 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