Browse Source

【综合】解决冲突

tangchao 10 months ago
parent
commit
939f1c1d2a
1 changed files with 0 additions and 4 deletions
  1. 0 4
      PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

+ 0 - 4
PDF Office/PDF Reader Pro.xcodeproj/project.pbxproj

@@ -196,7 +196,6 @@
 		89E9B40A295D268E00AEFA61 /* KMEditImagePropertyViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 89E9B405295D268E00AEFA61 /* KMEditImagePropertyViewController.xib */; };
 		9F00CCBB2A2F1E0F00AC462E /* dsa_priv.pem in Resources */ = {isa = PBXBuildFile; fileRef = 9F00CCB72A2F1E0F00AC462E /* dsa_priv.pem */; };
 		9F00CCBC2A2F1E0F00AC462E /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 9F00CCB82A2F1E0F00AC462E /* dsa_pub.pem */; };
-		9F00CCBF2A2F20E600AC462E /* pdfmasterprocast.xml in Resources */ = {isa = PBXBuildFile; fileRef = 9F00CCBE2A2F20E600AC462E /* pdfmasterprocast.xml */; };
 		9F00CCC02A2F251800AC462E /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F00CCB32A2F1E0100AC462E /* Sparkle.framework */; };
 		9F00CCC12A2F251800AC462E /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9F00CCB32A2F1E0100AC462E /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		9F00CCC52A2F2E2400AC462E /* AppCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F00CCC22A2F2E2300AC462E /* AppCenter.framework */; };
@@ -5319,7 +5318,6 @@
 		9F00CCB32A2F1E0100AC462E /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = "<group>"; };
 		9F00CCB72A2F1E0F00AC462E /* dsa_priv.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_priv.pem; sourceTree = "<group>"; };
 		9F00CCB82A2F1E0F00AC462E /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
-		9F00CCBE2A2F20E600AC462E /* pdfmasterprocast.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = pdfmasterprocast.xml; sourceTree = "<group>"; };
 		9F00CCC22A2F2E2300AC462E /* AppCenter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AppCenter.framework; sourceTree = "<group>"; };
 		9F00CCC32A2F2E2400AC462E /* AppCenterAnalytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AppCenterAnalytics.framework; sourceTree = "<group>"; };
 		9F00CCC42A2F2E2400AC462E /* AppCenterCrashes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = AppCenterCrashes.framework; sourceTree = "<group>"; };
@@ -7823,7 +7821,6 @@
 			children = (
 				9F00CCB72A2F1E0F00AC462E /* dsa_priv.pem */,
 				9F00CCB82A2F1E0F00AC462E /* dsa_pub.pem */,
-				9F00CCBE2A2F20E600AC462E /* pdfmasterprocast.xml */,
 			);
 			path = Sparkle;
 			sourceTree = "<group>";
@@ -15221,7 +15218,6 @@
 				ADD272D629B9CFE20032B5D6 /* KMLightNoNetworkView.xib in Resources */,
 				BB2EDF51296E63E5003BCF58 /* KMPageEditInsertCustomPageWindowController.xib in Resources */,
 				BBB376A32B10A7FD009539CC /* a_2b.png in Resources */,
-				9F00CCBF2A2F20E600AC462E /* pdfmasterprocast.xml in Resources */,
 				ADBC375A29CAE95700D93208 /* KMComparativeOutlineSectionCell.xib in Resources */,
 				BB1B0AEB2B4FC6E900889528 /* KMFunctionGuideMultiController.xib in Resources */,
 				9F88109A2B56877C00F69815 /* KMAnnotationChoiceWidgetOptionsViewController.xib in Resources */,