Merge branch 'master' of github.com:tangqiaoboy/xcode_tool

Tang Qiao · Tang Qiao · commit 18968ed7ad98 · 2014-08-07T10:16:43.000+08:00
Conflicts:
	CodeSnippets/45D5535E-44FA-491F-8E4B-3251A46D5372.codesnippet
diff --git a/CodeSnippets/45D5535E-44FA-491F-8E4B-3251A46D5372.codesnippet b/CodeSnippets/45D5535E-44FA-491F-8E4B-3251A46D5372.codesnippet
@@ -9,7 +9,7 @@
 		<string>ClassImplementation</string>
 	</array>
 	<key>IDECodeSnippetContents</key>
-	<string>+ (&lt;#ClassName#&gt; *)sharedInstance {
+	<string>+ (instancetype)sharedInstance {
     static id sharedInstance = nil;
     static dispatch_once_t onceToken;
     dispatch_once(&amp;onceToken, ^{
