Resolved conflict

buildasaurs · Jun 17, 2016 · 3e3b908 · 3e3b908
1 parent a7f1558
commit 3e3b908
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/BuildaGitServer/GitHub/GitHubIssue.swift b/BuildaGitServer/GitHub/GitHubIssue.swift
@@ -15,11 +15,9 @@ class GitHubIssue : GitHubEntity {
     var title: String
 
     required init(json: NSDictionary) throws {
-
-        self.number = json.intForKey("number")
-        self.body = json.stringForKey("body")
-        self.title = json.stringForKey("title")
-
+        self.number = try json.intForKey("number")
+        self.body = json.optionalStringForKey("body") ?? ""
+        self.title = try json.stringForKey("title")
         try super.init(json: json)
     }
 }