From 77c61d4235e0c86d7c3d3a3359f4ff9ab56c18ad Mon Sep 17 00:00:00 2001
From: dw <2935633002@qq.com>
Date: 星期三, 11 十二月 2024 16:20:11 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/脸谱AI_0817_1202

---
 GroupB_马喜龙/Client/石蕊/code/test_fp_login/test_fp_login.pro.user |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git "a/GroupB_\351\251\254\345\226\234\351\276\231/Client/\347\237\263\350\225\212/code/test_fp_login/test_fp_login.pro.user" "b/GroupB_\351\251\254\345\226\234\351\276\231/Client/\347\237\263\350\225\212/code/test_fp_login/test_fp_login.pro.user"
index e4669f3..eacc84c 100644
--- "a/GroupB_\351\251\254\345\226\234\351\276\231/Client/\347\237\263\350\225\212/code/test_fp_login/test_fp_login.pro.user"
+++ "b/GroupB_\351\251\254\345\226\234\351\276\231/Client/\347\237\263\350\225\212/code/test_fp_login/test_fp_login.pro.user"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.5.0, 2024-12-04T10:18:06. -->
+<!-- Written by QtCreator 4.5.0, 2024-12-05T11:49:36. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

--
Gitblit v1.8.0