# Conflicts: # CMakeLists.txt # active/app/package/metadata.desktop # conf/widgetannottools.cpp # core/version.h # generators/poppler/libokularGenerator_poppler.desktop # generators/txt/libokularGenerator_txt.desktop # generators/xps/libokularGenerator_xps.desktop # ui/annotationwidgets.cpp # ui/presentationwidget.cpp