Skip to content

added NOT #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eschramm wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added NOT #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ...roj/project.xcworkspace/xcuserdata/ericschramm.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion TestMe/TestMe/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// Override point for customization after application launch.
let emily = "Emily"
print(emily)
let merge = "let's make a merge conflict here."
let merge = "let's make a merge conflict NOT here."
return true
}

Expand Down