mainly changes to keep systems up to date

[distro-setup] / conflink

diff --git a/conflink b/conflink
index 0dffc229e80b1b662c75fc8a0a6098008efebb88..30d868e4dae606d244bc2decb19126fda8d70799 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 source /a/bin/errhandle/err
+_errcatch_cleanup() {
+  echo 1 >~/.local/conflink
+}
 
 
 usage() {
@@ -141,3 +144,5 @@ case $user in
     echo "$0: error: unexpected user"; exit 1
     ;;
 esac
+
+echo 0 >~/.local/conflink