From 6233697e019f1d34fa6fe08d5cea922e5da376da Mon Sep 17 00:00:00 2001
From: Changhua <lichanghua0821@gmail.com>
Date: Fri, 7 Mar 2025 17:04:13 +0800
Subject: [PATCH] chore(all): resolve conflicts

---
 WeChatFerry/spy/spy.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WeChatFerry/spy/spy.cpp b/WeChatFerry/spy/spy.cpp
index be4feab..ae5ee39 100644
--- a/WeChatFerry/spy/spy.cpp
+++ b/WeChatFerry/spy/spy.cpp
@@ -2,7 +2,7 @@
 
 #include <filesystem>
 
-#include "log.h"
+#include "log.hpp"
 #include "rpc_server.h"
 #include "spy.h"
 #include "util.h"