From 3feb95d56658270986cc4fe0e04f2d61954e4222 Mon Sep 17 00:00:00 2001 From: Eric Schramm Date: Mon, 15 Jan 2018 14:49:03 -0600 Subject: [PATCH] added NOT --- .../UserInterfaceState.xcuserstate | Bin 19242 -> 19301 bytes TestMe/TestMe/AppDelegate.swift | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/TestMe/TestMe.xcodeproj/project.xcworkspace/xcuserdata/ericschramm.xcuserdatad/UserInterfaceState.xcuserstate b/TestMe/TestMe.xcodeproj/project.xcworkspace/xcuserdata/ericschramm.xcuserdatad/UserInterfaceState.xcuserstate index ea9b91304f02872ab3432fcc3ed0e99bdadc617c..200f32a4b4df634d209aadee5ebc08eeab487fc4 100644 GIT binary patch delta 3858 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 delta 3760 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 F^ndE@k&FNU diff --git a/TestMe/TestMe/AppDelegate.swift b/TestMe/TestMe/AppDelegate.swift index a4dff49..5444add 100644 --- a/TestMe/TestMe/AppDelegate.swift +++ b/TestMe/TestMe/AppDelegate.swift @@ -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 }