ccb4a88742
git remote add ssk ../SignalServiceKit git remote update git merge -s ours --allow-unrelated-histories --no-commit ssk/master git read-tree --prefix=SignalServiceKit -u ssk/master git commit
26 lines
483 B
Objective-C
26 lines
483 B
Objective-C
//
|
|
// ViewController.m
|
|
// TSKitOSXTestApp
|
|
//
|
|
// Created by Frederic Jacobs on 06/12/15.
|
|
// Copyright © 2015 Open Whisper Systems. All rights reserved.
|
|
//
|
|
|
|
#import "ViewController.h"
|
|
|
|
@implementation ViewController
|
|
|
|
- (void)viewDidLoad {
|
|
[super viewDidLoad];
|
|
|
|
// Do any additional setup after loading the view.
|
|
}
|
|
|
|
- (void)setRepresentedObject:(id)representedObject {
|
|
[super setRepresentedObject:representedObject];
|
|
|
|
// Update the view, if already loaded.
|
|
}
|
|
|
|
@end
|