commit 7237f5b59adc55ac5165abffa9fe274d4a4a48e7
Merge: 2bc33fb eb3b202
Author: sharapat <kalabaevshj@gmail.com>
Date:   Wed May 29 01:13:03 2019 +0500

    fixed conflicts

diff --combined tests/vocabulary/.~lock.input.csv#
index d2c6623,0000000..c5cc1b1
mode 100644,000000..100644
--- a/tests/vocabulary/.~lock.input.csv#
+++ b/tests/vocabulary/.~lock.input.csv#
@@@ -1,1 -1,0 +1,1 @@@
- ,root,sharapat-Aspire-E5-571,29.05.2019 00:54,file:///home/sharapat/.config/libreoffice/4;
++,root,sharapat-Aspire-E5-571,29.05.2019 01:12,file:///home/sharapat/.config/libreoffice/4;