Fix merge conflicts

2021-12-02 10:30:58 -05:00
parent 8fa74af815 c3dda12f35
commit dbe14d4935
4 changed files with 34 additions and 58 deletions
--- a/3
+++ b/3
@@ -1171,7 +1171,6 @@ service_jriver-createrepo() {
 #     brc del-pkg .build-deps
 # }

-
 uninstall() {
    debug "Running: ${FUNCNAME[0]}"

@@ -1331,4 +1330,4 @@ main() {
 }


-main "$@"
+main "$@"