diff options
Diffstat (limited to 'src/mainview.cpp')
| -rw-r--r-- | src/mainview.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mainview.cpp b/src/mainview.cpp index 71f81d66..5432fa51 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -713,8 +713,4 @@ void MainView::mouseDoubleClickEvent(QMouseEvent *event) return; } KTabWidget::mouseDoubleClickEvent(event); -<<<<<<< HEAD:src/mainview.cpp } -======= -} ->>>>>>> master:src/mainview.cpp |