diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-21 00:28:57 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-21 00:28:57 +0200 |
| commit | 7aa314368f1f9d56818aebf8ab9dc669a713e7bb (patch) | |
| tree | ca14a3316ac45b28392f5f103aa30ded57f74c69 | |
| parent | c7f788e1846082a870dde58d15b355f9aa2cb4a7 (diff) | |
| download | meson-7aa314368f1f9d56818aebf8ab9dc669a713e7bb.zip meson-7aa314368f1f9d56818aebf8ab9dc669a713e7bb.tar.gz meson-7aa314368f1f9d56818aebf8ab9dc669a713e7bb.tar.bz2 | |
Some merge conflicts are logical. Such as this one was.
| -rwxr-xr-x | run_tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
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__': |