From d1c03ced34502125fa49bceb0a284d6a6d6f5789 Mon Sep 17 00:00:00 2001
From: Chizi123 <joelgrun@gmail.com>
Date: Fri, 23 Aug 2019 01:27:46 +0000
Subject: [PATCH] removing old packages from remote

---
 build.sh |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 1b1a9f7..8c1b213 100755
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,7 @@
 #remote details
 RUSER=joelgrun
 RLOC=35.225.177.191
-RPATH=/var/www/joelg.cf/html/x86_64/
+RPATH=/var/www/joelg.cf/html/
 
 function newest_matching_file
 {
@@ -148,8 +148,4 @@
 git add x86_64
 git commit -m "'$(date +%d/%m/%y-%H:%M)'"
 git push
-<<<<<<< HEAD
-rsync -ah x86_64 $RUSER@$RLOC:$RPATH
-=======
 rsync -ah --delete x86_64 $RUSER@$RLOC:$RPATH
->>>>>>> 019ddc4837c10dc233d49bd517b6f08ef1e53519

--
Gitblit v1.9.3