Some merge conflicts are logical. Such as this one was.

8 years ago · 7aa314368f
parent c7f788e184
commit 7aa314368f
1 changed files with 1 additions and 1 deletions
--- 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__':