{"action":"created","comment":{"url":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls/comments/42009782","id":42009782,"diff_hunk":"@@ -0,0 +1,152 @@\n+//\n+//  ChartboostInterstitialCustomEvent.m\n+//  MoPubSDK\n+//\n+//  Copyright (c) 2012 MoPub, Inc. All rights reserved.\n+//\n+\n+#import \"ChartboostInterstitialCustomEvent.h\"\n+<<<<<<< HEAD\n+#import \"WBAdLogging.h\"\n+=======\n+#import \"MPLogging.h\"\n+>>>>>>> 3.13.0\n+#import \"MPChartboostRouter.h\"\n+#import \"MPInstanceProvider+Chartboost.h\"\n+#import <Chartboost/Chartboost.h>\n+\n+static NSString *gAppId = nil;\n+static NSString *gAppSignature = nil;\n+\n+#define kChartboostAppID        @\"YOUR_CHARTBOOST_APP_ID\"\n+#define kChartboostAppSignature @\"YOUR_CHARTBOOST_APP_SIGNATURE\"\n+\n+@interface ChartboostInterstitialCustomEvent () <ChartboostDelegate>\n+@end\n+\n+@implementation ChartboostInterstitialCustomEvent\n+\n++ (void)setAppId:(NSString *)appId\n+{\n+<<<<<<< HEAD\n+    AdLogType(WBAdLogLevelWarn, WBAdTypeInterstitial, @\"+setAppId for class ChartboostInterstitialCustomEvent is deprecated. Use the appId parameter when configuring your network in the MoPub UI.\");\n+=======\n+    MPLogWarn(@\"+setAppId for class ChartboostInterstitialCustomEvent is deprecated. Use the appId parameter when configuring your network in the MoPub UI.\");\n+>>>>>>> 3.13.0\n+    gAppId = [appId copy];\n+}\n+\n++ (void)setAppSignature:(NSString *)appSignature\n+{\n+<<<<<<< HEAD\n+    AdLogType(WBAdLogLevelWarn, WBAdTypeInterstitial, @\"+setAppSignature for class ChartboostInterstitialCustomEvent is deprecated. Use the appSignature parameter when configuring your network in the MoPub UI.\");\n+=======\n+    MPLogWarn(@\"+setAppSignature for class ChartboostInterstitialCustomEvent is deprecated. Use the appSignature parameter when configuring your network in the MoPub UI.\");\n+>>>>>>> 3.13.0\n+    gAppSignature = [appSignature copy];\n+}\n+\n+- (void)invalidate\n+{\n+    [[MPChartboostRouter sharedRouter] unregisterInterstitialEvent:self];\n+    self.location = nil;\n+}\n+\n+#pragma mark - MPInterstitialCustomEvent Subclass Methods\n+\n+- (void)requestInterstitialWithCustomEventInfo:(NSDictionary *)info\n+{\n+    NSString *appId = [info objectForKey:@\"appId\"];\n+    if (!appId) {\n+        appId = gAppId;\n+\n+        if ([appId length] == 0) {\n+<<<<<<< HEAD","path":"AdNetworkSupport/Chartboost/ChartboostInterstitialCustomEvent.m.orig","position":64,"original_position":64,"commit_id":"245be0fe59f7969cb8a9f854a647ee7e4365c6c7","original_commit_id":"245be0fe59f7969cb8a9f854a647ee7e4365c6c7","user":{"login":"tpulmano","id":453898,"avatar_url":"https://avatars.githubusercontent.com/u/453898?v=3","gravatar_id":"","url":"https://api.github.com/users/tpulmano","html_url":"https://github.com/tpulmano","followers_url":"https://api.github.com/users/tpulmano/followers","following_url":"https://api.github.com/users/tpulmano/following{/other_user}","gists_url":"https://api.github.com/users/tpulmano/gists{/gist_id}","starred_url":"https://api.github.com/users/tpulmano/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tpulmano/subscriptions","organizations_url":"https://api.github.com/users/tpulmano/orgs","repos_url":"https://api.github.com/users/tpulmano/repos","events_url":"https://api.github.com/users/tpulmano/events{/privacy}","received_events_url":"https://api.github.com/users/tpulmano/received_events","type":"User","site_admin":false},"body":"Unresolved merge here","created_at":"2015-10-14T15:34:26Z","updated_at":"2015-10-14T15:34:26Z","html_url":"https://github.com/scopely/mopub-ios-sdk/pull/13#discussion_r42009782","pull_request_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls/13","_links":{"self":{"href":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls/comments/42009782"},"html":{"href":"https://github.com/scopely/mopub-ios-sdk/pull/13#discussion_r42009782"},"pull_request":{"href":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls/13"}}},"pull_request":{"url":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls/13","id":47602220,"html_url":"https://github.com/scopely/mopub-ios-sdk/pull/13","diff_url":"https://github.com/scopely/mopub-ios-sdk/pull/13.diff","patch_url":"https://github.com/scopely/mopub-ios-sdk/pull/13.patch","issue_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/issues/13","number":13,"state":"open","locked":false,"title":"Update 3.13.0","user":{"login":"nikhilcn","id":914487,"avatar_url":"https://avatars.githubusercontent.com/u/914487?v=3","gravatar_id":"","url":"https://api.github.com/users/nikhilcn","html_url":"https://github.com/nikhilcn","followers_url":"https://api.github.com/users/nikhilcn/followers","following_url":"https://api.github.com/users/nikhilcn/following{/other_user}","gists_url":"https://api.github.com/users/nikhilcn/gists{/gist_id}","starred_url":"https://api.github.com/users/nikhilcn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/nikhilcn/subscriptions","organizations_url":"https://api.github.com/users/nikhilcn/orgs","repos_url":"https://api.github.com/users/nikhilcn/repos","events_url":"https://api.github.com/users/nikhilcn/events{/privacy}","received_events_url":"https://api.github.com/users/nikhilcn/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-10-13T23:33:09Z","updated_at":"2015-10-14T15:34:26Z","closed_at":null,"merged_at":null,"merge_commit_sha":"f18ddb059ac8d48b20ee1106b09872c8f93ea465","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls/13/commits","review_comments_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls/13/comments","review_comment_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls/comments{/number}","comments_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/issues/13/comments","statuses_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/statuses/245be0fe59f7969cb8a9f854a647ee7e4365c6c7","head":{"label":"scopely:update-3.13.0","ref":"update-3.13.0","sha":"245be0fe59f7969cb8a9f854a647ee7e4365c6c7","user":{"login":"scopely","id":618945,"avatar_url":"https://avatars.githubusercontent.com/u/618945?v=3","gravatar_id":"","url":"https://api.github.com/users/scopely","html_url":"https://github.com/scopely","followers_url":"https://api.github.com/users/scopely/followers","following_url":"https://api.github.com/users/scopely/following{/other_user}","gists_url":"https://api.github.com/users/scopely/gists{/gist_id}","starred_url":"https://api.github.com/users/scopely/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/scopely/subscriptions","organizations_url":"https://api.github.com/users/scopely/orgs","repos_url":"https://api.github.com/users/scopely/repos","events_url":"https://api.github.com/users/scopely/events{/privacy}","received_events_url":"https://api.github.com/users/scopely/received_events","type":"Organization","site_admin":false},"repo":{"id":10181155,"name":"mopub-ios-sdk","full_name":"scopely/mopub-ios-sdk","owner":{"login":"scopely","id":618945,"avatar_url":"https://avatars.githubusercontent.com/u/618945?v=3","gravatar_id":"","url":"https://api.github.com/users/scopely","html_url":"https://github.com/scopely","followers_url":"https://api.github.com/users/scopely/followers","following_url":"https://api.github.com/users/scopely/following{/other_user}","gists_url":"https://api.github.com/users/scopely/gists{/gist_id}","starred_url":"https://api.github.com/users/scopely/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/scopely/subscriptions","organizations_url":"https://api.github.com/users/scopely/orgs","repos_url":"https://api.github.com/users/scopely/repos","events_url":"https://api.github.com/users/scopely/events{/privacy}","received_events_url":"https://api.github.com/users/scopely/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/scopely/mopub-ios-sdk","description":"","fork":true,"url":"https://api.github.com/repos/scopely/mopub-ios-sdk","forks_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/forks","keys_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/keys{/key_id}","collaborators_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/teams","hooks_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/hooks","issue_events_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/issues/events{/number}","events_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/events","assignees_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/assignees{/user}","branches_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/branches{/branch}","tags_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/tags","blobs_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/git/refs{/sha}","trees_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/git/trees{/sha}","statuses_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/statuses/{sha}","languages_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/languages","stargazers_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/stargazers","contributors_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/contributors","subscribers_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/subscribers","subscription_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/subscription","commits_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/commits{/sha}","git_commits_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/git/commits{/sha}","comments_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/comments{/number}","issue_comment_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/issues/comments{/number}","contents_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/contents/{+path}","compare_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/compare/{base}...{head}","merges_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/merges","archive_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/downloads","issues_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/issues{/number}","pulls_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls{/number}","milestones_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/milestones{/number}","notifications_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/labels{/name}","releases_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/releases{/id}","created_at":"2013-05-20T20:20:57Z","updated_at":"2015-10-09T22:08:27Z","pushed_at":"2015-10-13T23:45:34Z","git_url":"git://github.com/scopely/mopub-ios-sdk.git","ssh_url":"git@github.com:scopely/mopub-ios-sdk.git","clone_url":"https://github.com/scopely/mopub-ios-sdk.git","svn_url":"https://github.com/scopely/mopub-ios-sdk","homepage":null,"size":13344,"stargazers_count":0,"watchers_count":0,"language":"Objective-C","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":3,"forks":0,"open_issues":3,"watchers":0,"default_branch":"master"}},"base":{"label":"scopely:master","ref":"master","sha":"5c166218906365744aa80fb59e37c348dee05ee6","user":{"login":"scopely","id":618945,"avatar_url":"https://avatars.githubusercontent.com/u/618945?v=3","gravatar_id":"","url":"https://api.github.com/users/scopely","html_url":"https://github.com/scopely","followers_url":"https://api.github.com/users/scopely/followers","following_url":"https://api.github.com/users/scopely/following{/other_user}","gists_url":"https://api.github.com/users/scopely/gists{/gist_id}","starred_url":"https://api.github.com/users/scopely/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/scopely/subscriptions","organizations_url":"https://api.github.com/users/scopely/orgs","repos_url":"https://api.github.com/users/scopely/repos","events_url":"https://api.github.com/users/scopely/events{/privacy}","received_events_url":"https://api.github.com/users/scopely/received_events","type":"Organization","site_admin":false},"repo":{"id":10181155,"name":"mopub-ios-sdk","full_name":"scopely/mopub-ios-sdk","owner":{"login":"scopely","id":618945,"avatar_url":"https://avatars.githubusercontent.com/u/618945?v=3","gravatar_id":"","url":"https://api.github.com/users/scopely","html_url":"https://github.com/scopely","followers_url":"https://api.github.com/users/scopely/followers","following_url":"https://api.github.com/users/scopely/following{/other_user}","gists_url":"https://api.github.com/users/scopely/gists{/gist_id}","starred_url":"https://api.github.com/users/scopely/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/scopely/subscriptions","organizations_url":"https://api.github.com/users/scopely/orgs","repos_url":"https://api.github.com/users/scopely/repos","events_url":"https://api.github.com/users/scopely/events{/privacy}","received_events_url":"https://api.github.com/users/scopely/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/scopely/mopub-ios-sdk","description":"","fork":true,"url":"https://api.github.com/repos/scopely/mopub-ios-sdk","forks_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/forks","keys_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/keys{/key_id}","collaborators_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/teams","hooks_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/hooks","issue_events_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/issues/events{/number}","events_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/events","assignees_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/assignees{/user}","branches_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/branches{/branch}","tags_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/tags","blobs_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/git/refs{/sha}","trees_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/git/trees{/sha}","statuses_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/statuses/{sha}","languages_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/languages","stargazers_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/stargazers","contributors_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/contributors","subscribers_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/subscribers","subscription_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/subscription","commits_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/commits{/sha}","git_commits_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/git/commits{/sha}","comments_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/comments{/number}","issue_comment_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/issues/comments{/number}","contents_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/contents/{+path}","compare_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/compare/{base}...{head}","merges_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/merges","archive_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/downloads","issues_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/issues{/number}","pulls_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls{/number}","milestones_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/milestones{/number}","notifications_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/labels{/name}","releases_url":"https://api.github.com/repos/scopely/mopub-ios-sdk/releases{/id}","created_at":"2013-05-20T20:20:57Z","updated_at":"2015-10-09T22:08:27Z","pushed_at":"2015-10-13T23:45:34Z","git_url":"git://github.com/scopely/mopub-ios-sdk.git","ssh_url":"git@github.com:scopely/mopub-ios-sdk.git","clone_url":"https://github.com/scopely/mopub-ios-sdk.git","svn_url":"https://github.com/scopely/mopub-ios-sdk","homepage":null,"size":13344,"stargazers_count":0,"watchers_count":0,"language":"Objective-C","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":3,"forks":0,"open_issues":3,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls/13"},"html":{"href":"https://github.com/scopely/mopub-ios-sdk/pull/13"},"issue":{"href":"https://api.github.com/repos/scopely/mopub-ios-sdk/issues/13"},"comments":{"href":"https://api.github.com/repos/scopely/mopub-ios-sdk/issues/13/comments"},"review_comments":{"href":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls/13/comments"},"review_comment":{"href":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/scopely/mopub-ios-sdk/pulls/13/commits"},"statuses":{"href":"https://api.github.com/repos/scopely/mopub-ios-sdk/statuses/245be0fe59f7969cb8a9f854a647ee7e4365c6c7"}}}}