X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=conflink;h=d661e172dfd5a5b1d2f5790236221dfc59f62232;hb=51c8b40fd2aac71d29dc9298ca65425725ad1edd;hp=855014377e8c74edc177e8906eede0787946d1d8;hpb=0d347f93336619d663f1f3cdd771b92df390c494;p=distro-setup diff --git a/conflink b/conflink index 8550143..d661e17 100755 --- a/conflink +++ b/conflink @@ -1,6 +1,6 @@ #!/bin/bash -source /a/bin/errhandle/err +source /a/bin/bash-bear-trap/bash-bear err-cleanup() { echo 1 >~/.local/conflink }