Vladimír Čunát 46ea770b2b Revert "python: Move catch_conflicts.py into subdirectory (#23600)" (#24528)
This reverts commit 76213d102c1eaa91e733b326d9d312b60103d88a.
2017-04-01 12:20:31 +02:00
..
2017-02-14 09:23:59 +01:00