Merged conflicts

Former-commit-id: f5827692ad
2017-06-27 13:15:20 -04:00 · 2017-06-27 13:15:20 -04:00 · 485d5074fb
commit 485d5074fb
--- a/configure.sh
+++ b/configure.sh
@ -142,4 +142,4 @@ else
    echo "Invalid instructions." >&2
    usage
    exit 1
-fi
+fi