Either add this to your gitconfig:
[merge]
tool = kdiff3
[mergetool "kdiff3"]
cmd = \"C:\\\\Program Files\\\\KDiff3\\\\kdiff3\" $BASE $LOCAL $REMOTE -o $MERGED
Or run These at the command line:
$ git config --global merge.tool kdiff3
using System; | |
using System.Collections; | |
using System.Collections.Generic; | |
using System.Data; | |
using System.Diagnostics; | |
using System.Collections.ObjectModel; | |
using System.Runtime.Serialization; | |
/* | |
using My.Domain.Namespace; |
Either add this to your gitconfig:
[merge]
tool = kdiff3
[mergetool "kdiff3"]
cmd = \"C:\\\\Program Files\\\\KDiff3\\\\kdiff3\" $BASE $LOCAL $REMOTE -o $MERGED
Or run These at the command line:
$ git config --global merge.tool kdiff3
NSTimeZone - Timezone Abbreviations ADT = "America/Halifax"; AKDT = "America/Juneau"; AKST = "America/Juneau"; ART = "America/Argentina/Buenos_Aires"; AST = "America/Halifax"; BDT = "Asia/Dhaka"; BRST = "America/Sao_Paulo"; BRT = "America/Sao_Paulo"; BST = "Europe/London";
import UIKit | |
import Foundation | |
/** Design a function that takes two string parameters: | |
input | |
pattern | |
The function should return the longest substring that fully matches | |
the provided pattern. Assume that the input and pattern characters are | |
alphabetic. |
#import <Foundation/Foundation.h> | |
@interface EmailRepository : NSObject | |
+ (id)sharedEmailRepository; | |
- (void)getDataFromServer:(NSString *)emailAddress onComplete:(void (^)(NSString *response))completionBlock onFailure:(void (^)(NSString *response))failureBlock; | |
@end |
/** | |
* @class Ext.ux.form.MultiSelect | |
* @extends Ext.form.field.Base | |
* A control that allows selection and form submission of multiple list items. | |
* | |
* @history | |
* 2008-06-19 bpm Original code contributed by Toby Stuart (with contributions from Robert Williams) | |
* 2008-06-19 bpm Docs and demo code clean up | |
* | |
* @constructor |
- (CGSize)tableView:(UITableView *)tableView sizeForHeaderLabelInSection:(NSInteger)section | |
{ | |
NSString *text = [self tableView:tableView titleForHeaderInSection:section]; | |
CGSize constraint = CGSizeMake(self.view.frame.size.width - kSectionTitleLeftMargin - kSectionTitleRightMargin, kMaxSectionTitleHeight); | |
return [text sizeWithFont:[self fontForSectionHeader] constrainedToSize:constraint lineBreakMode:UILineBreakModeWordWrap]; | |
} | |
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section | |
{ |
the proper sequence is | |
-(void)initWithCoder | |
-(void)awakefromNib //(if story board is used) | |
or | |
-(void)loadView----() //if manually generating the view contoller | |
-(void)viewDidLoad-----(called only once in the life cycle of viewController) | |
-(void)viewWillAppear | |
-(void)viewDidAppear |
#import "AppDelegate.h" | |
#import <Realm/Realm.h> | |
// Define your models | |
@interface Dog : RLMObject | |
@property NSString *name; | |
@property NSInteger age; | |
@end | |
@implementation Dog |
static void Main() | |
{ | |
Console.WriteLine(@" | |
LET OFF SOME STEAM, BENNETT. | |
'''';;;;;;;;;;;';;;''';::,,,:::::::;''++++++++++++ | |
;;;::::;;;;;;;;'++#'';;::,,,:::;;::;''++++++++++++ | |
;;::::::::;;;;##++#@#';;:,,:::;;;;;;''++++++++++++ | |
;;::::::::;;;#+,,,,;;+;;:::::;;'';;;'''+++++++++++ |