solve merge conflict

2025-12-05 23:05:10 -07:00 · 2025-12-05 23:05:10 -07:00 · 3f6a77f890
commit 3f6a77f890
parent 6b21ac7be9 cc05431879
171 changed files with 730 additions and 926 deletions
--- a/src/core.c
+++ b/src/core.c
@ -1,4 +1,3 @@
-/* $Id$ */
 #include <Mw/Milsko.h>
 #include <wayland-util.h>