From ebd751a0a30522160af8d4e3e44cf88382c1567c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Sat, 1 Feb 2014 14:56:14 +0100
Subject: RPM Packaging: update build scripts

---
 redhat/buildenv.sh | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'redhat/buildenv.sh')

diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index aea4036dd..26dd017cd 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -12,10 +12,6 @@ export PATH="${PATH}:${TDE_GITBASEPKG}"
 
 # Distribution suffix (e.g: .el6 , .mga3 ...)
 export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )"
-<<<<<<< HEAD
-=======
-#alias dist='~/bin/rpmdist.sh --dist'
->>>>>>> 650867080ee48b3e555a57f7ac0dab05eb4c6447
 
 # Go to the RPMS folder
 alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}'
-- 
cgit v1.2.3