From 46a733bf8137cf574ab3ce84cff220cef3e1c7ea Mon Sep 17 00:00:00 2001
From: Chizi123 <joelgrun@gmail.com>
Date: Fri, 23 Aug 2019 01:26:57 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/Chizi123/Arch-autobuild-repo
---
build.sh | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/build.sh b/build.sh
index 8c1b213..1b1a9f7 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/
+RPATH=/var/www/joelg.cf/html/x86_64/
function newest_matching_file
{
@@ -148,4 +148,8 @@
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