From 39cb69508719e6180a4cf63d7d4ac3440d10714b Mon Sep 17 00:00:00 2001
From: Jacopo De Simoi <wilderjds@protonmail.com>
Date: Thu, 17 Feb 2022 15:59:35 -0500
Subject: [PATCH] Fix compilation of moc stuff

---
 shell/shellcorona.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index aeec2d952..164bbb93b 100644
--- 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