Commit 40daf3f2 by Shaik Ghouse

fact function

parent edb09a24
......@@ -13,7 +13,12 @@ class ViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
print("Hello this is master")
print("Hello this is feature/developemt")
}
func findFactorial(x : Int) -> Int {
return x
}
override func 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()
<<<<<<< HEAD
print("Hellow this is Master Branch")
=======
print("Hello this is feature/development code")
>>>>>>> feature/development
}
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