From 7aa314368f1f9d56818aebf8ab9dc669a713e7bb Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Wed, 21 Dec 2016 00:28:57 +0200 Subject: Some merge conflicts are logical. Such as this one was. --- run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_tests.py b/run_tests.py index baaad59..5ba41bd 100755 --- a/run_tests.py +++ b/run_tests.py @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import subprocess, sys +import subprocess, sys, shutil from mesonbuild import mesonlib if __name__ == '__main__': -- cgit v1.1