diff options
| author | Treeve Jelbert | 2020-11-02 10:43:41 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2020-11-02 10:43:41 +0100 |
| commit | 5069714e7dd0c78f04108c56bd580a0ba66d1971 (patch) | |
| tree | 57a712690745ecb9ad1a6db612138055dc5127e7 /qt5 | |
| parent | c50533de7212c40c0cb11070555179061a9e55a4 (diff) | |
qtwebchannel - delete CONFLICTS
Diffstat (limited to 'qt5')
| -rwxr-xr-x | qt5/qtwebchannel/CONFLICTS | 1 | ||||
| -rw-r--r-- | qt5/qtwebchannel/HISTORY | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/qt5/qtwebchannel/CONFLICTS b/qt5/qtwebchannel/CONFLICTS deleted file mode 100755 index 2e45c7ac8f..0000000000 --- a/qt5/qtwebchannel/CONFLICTS +++ /dev/null @@ -1 +0,0 @@ -conflicts qtwebchannel y diff --git a/qt5/qtwebchannel/HISTORY b/qt5/qtwebchannel/HISTORY index b7aaba7ee6..5cf5e3b785 100644 --- a/qt5/qtwebchannel/HISTORY +++ b/qt5/qtwebchannel/HISTORY @@ -1,3 +1,6 @@ +2020-11-02 Treeve Jelbert <treeve@sourcemage.org> + * CONLICTS: deleted + 2020-09-09 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 5.15.1 |