diff options
Diffstat (limited to 'qt5/qtcanvas3d/CONFLICTS')
| -rwxr-xr-x | qt5/qtcanvas3d/CONFLICTS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qt5/qtcanvas3d/CONFLICTS b/qt5/qtcanvas3d/CONFLICTS deleted file mode 100755 index c0b0915b8c..0000000000 --- a/qt5/qtcanvas3d/CONFLICTS +++ /dev/null @@ -1 +0,0 @@ -conflicts qtcanvas3d y |