GitHub PullRequestReviewCommentEvent at 2014-03-20 16:15:35
Repository: bubolo
Actor: ChristopherCanfield
Payload: {"comment":{"url":"https://api.github.com/repos/BU-CS673/bubolo/pulls/comments/10802298","id":10802298,"diff_hunk":"@@ -1,29 +1,75 @@\n package bubolo.graphics;\n \n import com.badlogic.gdx.graphics.Camera;\n-import com.badlogic.gdx.graphics.Texture;\n import com.badlogic.gdx.graphics.g2d.SpriteBatch;\n+import com.badlogic.gdx.graphics.g2d.TextureRegion;\n \n+import bubolo.util.GameLogicException;\n+import bubolo.util.TextureUtil;\n import bubolo.world.entity.concrete.Base;\n \n /**\n- * The graphical representation of a base entity.\n+ * The graphical representation of a Base.\n+ * \n+ * ======= import com.badlogic.gdx.graphics.Texture; import\n+ * com.badlogic.gdx.graphics.g2d.SpriteBatch;\n+ * \n+ * import bubolo.world.entity.concrete.Base;\n+ * \n+ * /** The graphical representation of a base entity. >>>>>>> production","path":"bubolo/src/bubolo/graphics/BaseSprite.java","position":21,"original_position":21,"commit_id":"5bb8bf9c0bd7b3d4c777bc01d64f5731e8a12233","original_commit_id":"5bb8bf9c0bd7b3d4c777bc01d64f5731e8a12233","user":{"login":"ChristopherCanfield","id":2830392,"avatar_url":"https://avatars.githubusercontent.com/u/2830392?","gravatar_id":"dde26d27823aaa88c47ab5fd74069aa0","url":"https://api.github.com/users/ChristopherCanfield","html_url":"https://github.com/ChristopherCanfield","followers_url":"https://api.github.com/users/ChristopherCanfield/followers","following_url":"https://api.github.com/users/ChristopherCanfield/following{/other_user}","gists_url":"https://api.github.com/users/ChristopherCanfield/gists{/gist_id}","starred_url":"https://api.github.com/users/ChristopherCanfield/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ChristopherCanfield/subscriptions","organizations_url":"https://api.github.com/users/ChristopherCanfield/orgs","repos_url":"https://api.github.com/users/ChristopherCanfield/repos","events_url":"https://api.github.com/users/ChristopherCanfield/events{/privacy}","received_events_url":"https://api.github.com/users/ChristopherCanfield/received_events","type":"User","site_admin":false},"body":"It looks like a merge conflict entry made it into this comment: \">>>>>>> production\". We can leave it and fix it in a future commit if there are no other issues.","created_at":"2014-03-20T16:15:35Z","updated_at":"2014-03-20T16:15:35Z","html_url":"https://github.com/BU-CS673/bubolo/pull/171#discussion_r10802298","pull_request_url":"https://api.github.com/repos/BU-CS673/bubolo/pulls/171","_links":{"self":{"href":"https://api.github.com/repos/BU-CS673/bubolo/pulls/comments/10802298"},"html":{"href":"https://github.com/BU-CS673/bubolo/pull/171#discussion_r10802298"},"pull_request":{"href":"https://api.github.com/repos/BU-CS673/bubolo/pulls/171"}}}}