Commit 672c1c5c by Shaik Ghouse

fix menu conflicts

parent 0dae3559
...@@ -13,7 +13,7 @@ class DetailedViewController: UIViewController { ...@@ -13,7 +13,7 @@ class DetailedViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
print("Hello first line in detailedVC") print("Hello first line in detailedVC")
print("Commit checking for Squash")
} }
override func didReceiveMemoryWarning() { override func didReceiveMemoryWarning() {
......
...@@ -13,6 +13,8 @@ class HomeViewController: UIViewController { ...@@ -13,6 +13,8 @@ class HomeViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
print("Hello first line in homeviewcontroller") print("Hello first line in homeviewcontroller")
print("Lets start the project")
print("Commit checking for Squash")
} }
override func didReceiveMemoryWarning() { override func didReceiveMemoryWarning() {
......
...@@ -14,6 +14,13 @@ class MenuViewController: UIViewController { ...@@ -14,6 +14,13 @@ class MenuViewController: UIViewController {
super.viewDidLoad() super.viewDidLoad()
print("Hello first line in MenuVC") print("Hello first line in MenuVC")
menuList = ["Home", "Recent", "Settings", "Logout"] menuList = ["Home", "Recent", "Settings", "Logout"]
print("Commit checking for Squash")
menuList = ["Home", "Recent", "Settings", "Logout"]
if let menuArray = menuList {
for menu in menuArray {
print(menu)
}
}
} }
override func didReceiveMemoryWarning() { override func didReceiveMemoryWarning() {
......
...@@ -13,6 +13,7 @@ class RecentViewController: UIViewController { ...@@ -13,6 +13,7 @@ class RecentViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
print("Hello first line in Recent") print("Hello first line in Recent")
print("Commit checking for Squash")
} }
override func didReceiveMemoryWarning() { 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