diff options
| author | Treeve Jelbert | 2020-11-02 10:43:42 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2020-11-02 10:43:42 +0100 |
| commit | a34abe5e512293eb5902aaaff828de3aa6372018 (patch) | |
| tree | adcb82e369568541c599a76be83ddccdd7aa2ce7 /qt5 | |
| parent | 290eb5091f4e8e6233ee337e664f6e1eabdeaa1a (diff) | |
qtwebview - delete CONFLICTS
Diffstat (limited to 'qt5')
| -rwxr-xr-x | qt5/qtwebview/CONFLICTS | 1 | ||||
| -rw-r--r-- | qt5/qtwebview/HISTORY | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/qt5/qtwebview/CONFLICTS b/qt5/qtwebview/CONFLICTS deleted file mode 100755 index a26f5bbdfc..0000000000 --- a/qt5/qtwebview/CONFLICTS +++ /dev/null @@ -1 +0,0 @@ -conflicts qtwebview y diff --git a/qt5/qtwebview/HISTORY b/qt5/qtwebview/HISTORY index 410ebc414f..792ffe548b 100644 --- a/qt5/qtwebview/HISTORY +++ b/qt5/qtwebview/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 |