Permalink
Browse files

fix files backed out during merge

  • Loading branch information...
1 parent 148962f commit 572074449eef1847e89766073cbacffb471b9ea5 @troppoli troppoli committed Jan 19, 2012
Showing with 10 additions and 5 deletions.
  1. +10 −5 ShareKit.xcodeproj/project.pbxproj
@@ -112,6 +112,7 @@
A57772BC14BA1900003FC744 /* ObjectiveFlickr.m in Sources */ = {isa = PBXBuildFile; fileRef = A57772B714BA1900003FC744 /* ObjectiveFlickr.m */; };
A57772BD14BA1900003FC744 /* OFUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = A57772B914BA1900003FC744 /* OFUtilities.m */; };
A57772BE14BA1900003FC744 /* OFXMLMapper.m in Sources */ = {isa = PBXBuildFile; fileRef = A57772BB14BA1900003FC744 /* OFXMLMapper.m */; };
+ AA511B8014C893A10022332B /* SHKFormOptionController.m in Sources */ = {isa = PBXBuildFile; fileRef = AA511B7F14C893A10022332B /* SHKFormOptionController.m */; };
AAACE01B13CCB1F500A2118F /* DefaultSHKConfigurator.m in Sources */ = {isa = PBXBuildFile; fileRef = AAACE01613CCB1F500A2118F /* DefaultSHKConfigurator.m */; };
AAACE01C13CCB1F500A2118F /* LegacySHKConfigurator.m in Sources */ = {isa = PBXBuildFile; fileRef = AAACE01813CCB1F500A2118F /* LegacySHKConfigurator.m */; };
AAACE01D13CCB1F500A2118F /* SHKConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = AAACE01A13CCB1F500A2118F /* SHKConfiguration.m */; };
@@ -342,6 +343,8 @@
A57772B914BA1900003FC744 /* OFUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OFUtilities.m; sourceTree = "<group>"; };
A57772BA14BA1900003FC744 /* OFXMLMapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OFXMLMapper.h; sourceTree = "<group>"; };
A57772BB14BA1900003FC744 /* OFXMLMapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OFXMLMapper.m; sourceTree = "<group>"; };
+ AA511B7E14C893A10022332B /* SHKFormOptionController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SHKFormOptionController.h; sourceTree = "<group>"; };
+ AA511B7F14C893A10022332B /* SHKFormOptionController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SHKFormOptionController.m; sourceTree = "<group>"; };
AAACE01513CCB1F500A2118F /* DefaultSHKConfigurator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DefaultSHKConfigurator.h; sourceTree = "<group>"; };
AAACE01613CCB1F500A2118F /* DefaultSHKConfigurator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DefaultSHKConfigurator.m; sourceTree = "<group>"; };
AAACE01713CCB1F500A2118F /* LegacySHKConfigurator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LegacySHKConfigurator.h; sourceTree = "<group>"; };
@@ -881,18 +884,20 @@
43A536EF11DBE3B9004A1712 /* SHKActionSheet.m */,
43A536F011DBE3B9004A1712 /* SHKActivityIndicator.h */,
43A536F111DBE3B9004A1712 /* SHKActivityIndicator.m */,
- 7AF78BB114B71FD8008ACA5D /* SHKFormControllerLargeTextField.h */,
- 7AF78BB214B71FD8008ACA5D /* SHKFormControllerLargeTextField.m */,
43A536F211DBE3B9004A1712 /* SHKFormController.h */,
43A536F311DBE3B9004A1712 /* SHKFormController.m */,
+ 7AF78BB114B71FD8008ACA5D /* SHKFormControllerLargeTextField.h */,
+ 7AF78BB214B71FD8008ACA5D /* SHKFormControllerLargeTextField.m */,
43A536F411DBE3B9004A1712 /* SHKFormFieldCell.h */,
43A536F511DBE3B9004A1712 /* SHKFormFieldCell.m */,
43A536F611DBE3B9004A1712 /* SHKFormFieldSettings.h */,
43A536F711DBE3B9004A1712 /* SHKFormFieldSettings.m */,
- 43A536FC11DBE3B9004A1712 /* SHKShareMenu.h */,
- 43A536FD11DBE3B9004A1712 /* SHKShareMenu.m */,
+ AA511B7E14C893A10022332B /* SHKFormOptionController.h */,
+ AA511B7F14C893A10022332B /* SHKFormOptionController.m */,
43A536FA11DBE3B9004A1712 /* SHKOAuthView.h */,
43A536FB11DBE3B9004A1712 /* SHKOAuthView.m */,
+ 43A536FC11DBE3B9004A1712 /* SHKShareMenu.h */,
+ 43A536FD11DBE3B9004A1712 /* SHKShareMenu.m */,
43A536FE11DBE3B9004A1712 /* SHKViewControllerWrapper.h */,
43A536FF11DBE3B9004A1712 /* SHKViewControllerWrapper.m */,
);
@@ -1269,11 +1274,11 @@
FA5AA3BE149625460064DB24 /* SHKVkontakte.m in Sources */,
7A36F42714B2021100372747 /* SHKSharerDelegate.m in Sources */,
7A89681D14C80F9900DB07AF /* SHKFormControllerLargeTextField.m in Sources */,
- 7A0861D914A36E5A00FF509F /* SHKFormControllerLargeTextField.m in Sources */,
A57772B414BA0748003FC744 /* SSKeychain.m in Sources */,
A57772BC14BA1900003FC744 /* ObjectiveFlickr.m in Sources */,
A57772BD14BA1900003FC744 /* OFUtilities.m in Sources */,
A57772BE14BA1900003FC744 /* OFXMLMapper.m in Sources */,
+ AA511B8014C893A10022332B /* SHKFormOptionController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

0 comments on commit 5720744

Please sign in to comment.