Skip to content
GitLab
Explore
Sign in
Commit
46ea770b
authored
Apr 01, 2017
by
Vladimír Čunát
Committed by
GitHub
Apr 01, 2017
Browse files
Revert "python: Move catch_conflicts.py into subdirectory (#23600)" (#24528)
This reverts commit
76213d10
.
parent
76213d10
Changes
3
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment