Fix compilation of moc stuff

4 years ago · 39cb695087
parent 1b79bc2cd6
commit 39cb695087
1 changed files with 0 additions and 4 deletions
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@ -2118,8 +2118,4 @@ void ShellCorona::refreshCurrentShell()
 // Desktop corona handler
 #include "moc_shellcorona.cpp"
 <<<<<<< HEAD
 #include "shellcorona.moc"
 =======
 >>>>>>> ea99f2217... Add shortcut to hide panel