Merge pull request #1799 from martin-frbg/issue1796
authorMartin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Tue, 9 Oct 2018 06:20:52 +0000 (08:20 +0200)
committerGitHub <noreply@github.com>
Tue, 9 Oct 2018 06:20:52 +0000 (08:20 +0200)
Handle conflicting usage of ARCH in at least some BSD environments

1  2 
Makefile
Makefile.system

diff --cc Makefile
Simple merge
diff --cc Makefile.system
Simple merge