Merge pull request #3733 from Deuchnord/root-abort-update

author Kevin Decherf <kevin@kdecherf.com>

Wed, 17 Oct 2018 09:26:12 +0000 (11:26 +0200)

committer GitHub <noreply@github.com>

Wed, 17 Oct 2018 09:26:12 +0000 (11:26 +0200)
author Kevin Decherf <kevin@kdecherf.com>
Wed, 17 Oct 2018 09:26:12 +0000 (11:26 +0200)
committer GitHub <noreply@github.com>
Wed, 17 Oct 2018 09:26:12 +0000 (11:26 +0200)
diff --cc scripts/install.sh

index 62a46f4fb60f8100b6228cfcc0a28d6f0ff3ec23,8b7ea03f5fe77030abafbde6d852e5d425da0384..8b7ea03f5fe77030abafbde6d852e5d425da0384

mode 100755,100644..100755
--- 1/scripts/install.sh
--- 2/scripts/install.sh
+++ b/scripts/install.sh
diff --cc scripts/update.sh

index d0598135c459da808123851f231e46bdfcafa325,c62d104a3353a2e1443cc31a33d4d3270f74e2cc..c62d104a3353a2e1443cc31a33d4d3270f74e2cc

mode 100755,100644..100755
--- 1/scripts/update.sh
--- 2/scripts/update.sh
+++ b/scripts/update.sh
author	Kevin Decherf <kevin@kdecherf.com>
	Wed, 17 Oct 2018 09:26:12 +0000 (11:26 +0200)
committer	GitHub <noreply@github.com>
	Wed, 17 Oct 2018 09:26:12 +0000 (11:26 +0200)
		1	2
scripts/install.sh	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/update.sh	patch \|	diff1 \|	diff2 \|	blob \| history