fixes

StoryBook/ViewControllers/ViewController.swift

@@ -13,10 +13,7 @@ class ViewController: UIViewController {
 
 
     override func viewDidLoad() {
     override func viewDidLoad() {
         super.viewDidLoad()
         super.viewDidLoad()
-        print("Hello this is master")
-    }
-
-    func factorial() {
+        print("Hello this is feature/developemt")
         
         
     }
     }
     func factorial(x : Int) -> Int {
     func factorial(x : Int) -> Int {

StoryBook/ViewControllers/ViewController.swift.orig

+//
+//  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()
+    }
+
+
+}
+

StoryBook/ViewControllers/ViewController_BACKUP_3848.swift

+//
+//  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()
+    }
+
+
+}
+

StoryBook/ViewControllers/ViewController_BASE_3848.swift

+//
+//  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()
+    }
+
+
+}
+

StoryBook/ViewControllers/ViewController_LOCAL_3848.swift

+//
+//  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()
+    }
+
+
+}
+

StoryBook/ViewControllers/ViewController_REMOTE_3848.swift

+//
+//  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()
+    }
+
+
+}
+