remove accidental conflict markers caused by prev commits
-rw-r--r-- 44 .gitignore
drwxr-xr-x - 3rdparty
-rw-r--r-- 2977 README.txt
drwxr-xr-x - data
drwxr-xr-x - debian
drwxr-xr-x - scripts
drwxr-xr-x - src
-rw-r--r-- 8067 yberbrowser.pro
-rw-r--r-- 745 yberbrowser.qrc