diff --git a/GitTest.xcodeproj/project.pbxproj b/GitTest.xcodeproj/project.pbxproj index a48e05f..602581a 100644 --- a/GitTest.xcodeproj/project.pbxproj +++ b/GitTest.xcodeproj/project.pbxproj @@ -22,6 +22,7 @@ C866C3E91D07250700CD172E /* step5_3.jpg in Resources */ = {isa = PBXBuildFile; fileRef = C866C3E11D07250700CD172E /* step5_3.jpg */; }; C866C3EA1D07250700CD172E /* step6_1.jpg in Resources */ = {isa = PBXBuildFile; fileRef = C866C3E21D07250700CD172E /* step6_1.jpg */; }; C866C3EB1D07250700CD172E /* step6_2.jpg in Resources */ = {isa = PBXBuildFile; fileRef = C866C3E31D07250700CD172E /* step6_2.jpg */; }; + D0FF57D11DF1481B0096F5F1 /* JustTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D0FF57D01DF1481B0096F5F1 /* JustTest.m */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -44,6 +45,8 @@ C866C3E11D07250700CD172E /* step5_3.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = step5_3.jpg; sourceTree = ""; }; C866C3E21D07250700CD172E /* step6_1.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = step6_1.jpg; sourceTree = ""; }; C866C3E31D07250700CD172E /* step6_2.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = step6_2.jpg; sourceTree = ""; }; + D0FF57CF1DF1481B0096F5F1 /* JustTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JustTest.h; sourceTree = ""; }; + D0FF57D01DF1481B0096F5F1 /* JustTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JustTest.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -79,6 +82,8 @@ C866C3B61D07196900CD172E /* AppDelegate.h */, C866C3B71D07196900CD172E /* AppDelegate.m */, C866C3B91D07196900CD172E /* ViewController.h */, + D0FF57CF1DF1481B0096F5F1 /* JustTest.h */, + D0FF57D01DF1481B0096F5F1 /* JustTest.m */, C866C3BA1D07196900CD172E /* ViewController.m */, C866C3BC1D07196900CD172E /* Main.storyboard */, C866C3BF1D07196900CD172E /* Assets.xcassets */, @@ -188,6 +193,7 @@ C866C3BB1D07196900CD172E /* ViewController.m in Sources */, C866C3B81D07196900CD172E /* AppDelegate.m in Sources */, C866C3B51D07196900CD172E /* main.m in Sources */, + D0FF57D11DF1481B0096F5F1 /* JustTest.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/GitTest/Base.lproj/Main.storyboard b/GitTest/Base.lproj/Main.storyboard index f56d2f3..81a10aa 100644 --- a/GitTest/Base.lproj/Main.storyboard +++ b/GitTest/Base.lproj/Main.storyboard @@ -1,21 +1,26 @@ - - + + + + + - + + + - + - + - + diff --git a/GitTest/JustTest.h b/GitTest/JustTest.h new file mode 100644 index 0000000..a90cd35 --- /dev/null +++ b/GitTest/JustTest.h @@ -0,0 +1,13 @@ +// +// JustTest.h +// GitTest +// +// Created by Simons on 2016/12/2. +// Copyright © 2016年 MikeBoom. All rights reserved. +// + +#import + +@interface JustTest : NSObject + +@end diff --git a/GitTest/JustTest.m b/GitTest/JustTest.m new file mode 100644 index 0000000..5131bee --- /dev/null +++ b/GitTest/JustTest.m @@ -0,0 +1,13 @@ +// +// JustTest.m +// GitTest +// +// Created by Simons on 2016/12/2. +// Copyright © 2016年 MikeBoom. All rights reserved. +// + +#import "JustTest.h" + +@implementation JustTest + +@end diff --git a/GitTest/ViewController.m b/GitTest/ViewController.m index 9d1dbd4..d6cc154 100644 --- a/GitTest/ViewController.m +++ b/GitTest/ViewController.m @@ -16,12 +16,14 @@ @implementation ViewController - (void)viewDidLoad { [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. + // 这个工程只是用来学习Git相关技能的 + // 1.修复新注册用户A使用小姨妈功能后,B后进入小姨妈功能还是女性界面的问题。 + // dev分支的修改 + // dev分支再次修改 + // dev修改3 + // 123445 + // 2.修改feature/module2并提交。 } -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} @end