git: merge conflict resolved
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user