Steven 1 year ago
parent
commit
e42124ca37
1 changed files with 0 additions and 1 deletions
  1. 0 1
      KulexiuForTeacher/Pods/Pods.xcodeproj/project.pbxproj

+ 0 - 1
KulexiuForTeacher/Pods/Pods.xcodeproj/project.pbxproj

@@ -4810,7 +4810,6 @@
 			sourceTree = "<group>";
 		};
 		0F1B8488EF8B6BE02796C1039B9C26B4 /* CommonModel */ = {
->>>>>>> TX_IM
 			isa = PBXGroup;
 			children = (
 				0A0526536ACBA86672F85086EC0C2D57 /* TUIAIDenoiseSignatureManager.h */,