Commit da8b0d5119db738a92acc0a12e611fabdcc51f2a
Merge pull request #114 into master
TheCharlatan committed on 12/14/2020, 12:57:46 PMParent: bc2768510db42cfceb9867f8f571118ec32c2bb5
Parent: d22ead567e7d125255bb271144323be19bc13024
Files changed
| verify-merge.py | changed |
| verify-merge.py | ||
|---|---|---|
| @@ -185,8 +185,10 @@ | ||
| 185 | 185 | break |
| 186 | 186 | # The OSX SDK may change from time to time: |
| 187 | 187 | if 'sdk' in assert_file_contents[i]: |
| 188 | 188 | continue |
| 189 | + if assert_file_contents[i].strip() == '\'': | |
| 190 | + continue | |
| 189 | 191 | if assert_file_contents[i] != first_file_contents[i]: |
| 190 | 192 | sys.stderr.write('ERROR: Found conflicting contents on line: ' + str(i) + ' of file ') |
| 191 | 193 | sys.stderr.write(assert_file['path'] + ':\n' + assert_file_contents[i]) |
| 192 | 194 | sys.stderr.write(first_file + ':\n' + first_file_contents[i]) |
Built with git-ssb-web