git: merge conflict resolved

This commit is contained in:
2024-09-26 15:56:01 +02:00
parent 6b973497c7
commit 18e60ef789
8 changed files with 96 additions and 47 deletions

View File

@@ -11,7 +11,6 @@ pbuild::pre_configure_Darwin() {
export NO_APPLE_COMMON_CRYPTO=1
}
pbuild::pre_configure() {
#pbuild::add_configure_args "LIBS=-lintl"
pbuild::add_configure_args "--with-tcltk"