Commit edb09a24 by Shaik Ghouse

merge conflicts

parent a056d142
......@@ -13,7 +13,7 @@ class ViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
print("Hello this is feature/development code")
print("Hello this is master")
}
override func didReceiveMemoryWarning() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment