diff options
| author | Treeve Jelbert | 2020-11-02 10:43:41 +0100 |
|---|---|---|
| committer | Treeve Jelbert | 2020-11-02 10:43:41 +0100 |
| commit | bdcff6812ed2c749d235c5ddbbba3d52d02c5a02 (patch) | |
| tree | 75c032c19e329667113fccf1a6a01c672a274300 /qt5 | |
| parent | a382c9a2ecb2871dc90d0743572cda14400f2df0 (diff) | |
qtvirtualkeyboard - delete CONFLICTS
Diffstat (limited to 'qt5')
| -rwxr-xr-x | qt5/qtvirtualkeyboard/CONFLICTS | 1 | ||||
| -rw-r--r-- | qt5/qtvirtualkeyboard/HISTORY | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/qt5/qtvirtualkeyboard/CONFLICTS b/qt5/qtvirtualkeyboard/CONFLICTS deleted file mode 100755 index 7ed88f2153..0000000000 --- a/qt5/qtvirtualkeyboard/CONFLICTS +++ /dev/null @@ -1 +0,0 @@ -conflicts qtvirtualkeyboard y diff --git a/qt5/qtvirtualkeyboard/HISTORY b/qt5/qtvirtualkeyboard/HISTORY index df7365d466..e1947cf527 100644 --- a/qt5/qtvirtualkeyboard/HISTORY +++ b/qt5/qtvirtualkeyboard/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 |