iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
minor fixes
[distro-setup]
/
conflink
diff --git
a/conflink
b/conflink
index 093dc2d725cb4901221e0daf4266c7b2069d8b1e..55d7a02489dc6b1d1ae3cbf7d0f3152778d73215 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-1,7
+1,7
@@
#!/bin/bash
source /a/bin/errhandle/err
-
_errcatch_
cleanup() {
+
errcatch-
cleanup() {
echo 1 >~/.local/conflink
}