Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
enzevalos_iphone_workspace
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
enzevalos
enzevalos_iphone_workspace
Commits
97624474
Commit
97624474
authored
8 years ago
by
Joscha
Browse files
Options
Downloads
Patches
Plain Diff
fixed merge conflicts.
parent
32870e58
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Pods/Onboard/Source/OnboardingContentViewController.h
+0
-3
0 additions, 3 deletions
Pods/Onboard/Source/OnboardingContentViewController.h
Pods/Onboard/Source/OnboardingContentViewController.m
+1
-6
1 addition, 6 deletions
Pods/Onboard/Source/OnboardingContentViewController.m
with
1 addition
and
9 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
