Commit 1fb404b8 by Shaik Ghouse

fixes

parents 27654863 40daf3f2
...@@ -13,10 +13,7 @@ class ViewController: UIViewController { ...@@ -13,10 +13,7 @@ class ViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
print("Hello this is master") print("Hello this is feature/developemt")
}
func factorial() {
} }
func factorial(x : Int) -> Int { func factorial(x : Int) -> Int {
......
//
// ViewController.swift
// StoryBook
//
// Created by Ghouse Basha Shaik on 27/09/17.
// Copyright © 2017 Ghouse Basha Shaik. All rights reserved.
//
import UIKit
class ViewController: UIViewController {
@IBOutlet weak var mMenuView: UIView!
override func viewDidLoad() {
super.viewDidLoad()
print("Hello this is feature/developemt")
}
<<<<<<< HEAD
func factorial() {
}
func factorial(x : Int) -> Int {
return x
}
=======
func findFactorial(x : Int) -> Int {
return x
}
>>>>>>> feature/development
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
}
}
//
// ViewController.swift
// StoryBook
//
// Created by Ghouse Basha Shaik on 27/09/17.
// Copyright © 2017 Ghouse Basha Shaik. All rights reserved.
//
import UIKit
class ViewController: UIViewController {
@IBOutlet weak var mMenuView: UIView!
override func viewDidLoad() {
super.viewDidLoad()
print("Hello this is feature/developemt")
}
<<<<<<< HEAD
func factorial() {
}
func factorial(x : Int) -> Int {
return x
}
=======
func findFactorial(x : Int) -> Int {
return x
}
>>>>>>> feature/development
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
}
}
//
// ViewController.swift
// StoryBook
//
// Created by Ghouse Basha Shaik on 27/09/17.
// Copyright © 2017 Ghouse Basha Shaik. All rights reserved.
//
import UIKit
class ViewController: UIViewController {
@IBOutlet weak var mMenuView: UIView!
override func viewDidLoad() {
super.viewDidLoad()
print("Hello this is master")
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
}
}
//
// ViewController.swift
// StoryBook
//
// Created by Ghouse Basha Shaik on 27/09/17.
// Copyright © 2017 Ghouse Basha Shaik. All rights reserved.
//
import UIKit
class ViewController: UIViewController {
@IBOutlet weak var mMenuView: UIView!
override func viewDidLoad() {
super.viewDidLoad()
print("Hello this is master")
}
func factorial() {
}
func factorial(x : Int) -> Int {
return x
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
}
}
//
// ViewController.swift
// StoryBook
//
// Created by Ghouse Basha Shaik on 27/09/17.
// Copyright © 2017 Ghouse Basha Shaik. All rights reserved.
//
import UIKit
class ViewController: UIViewController {
@IBOutlet weak var mMenuView: UIView!
override func viewDidLoad() {
super.viewDidLoad()
print("Hello this is feature/developemt")
}
func findFactorial(x : Int) -> Int {
return x
}
override func didReceiveMemoryWarning() {
super.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