summaryrefslogtreecommitdiffstats
path: root/redhat/buildenv.sh
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/buildenv.sh')
-rw-r--r--redhat/buildenv.sh4
1 files changed, 0 insertions, 4 deletions
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}'