Diff line removed

leticiawanderley · leticiawanderley · commit 77ab63c8cea3 · 2017-04-05T11:17:42.000-03:00
diff --git a/comments.json b/comments.json
@@ -23,6 +23,5 @@
         "id": 1464988717637,
         "author": "evil",
         "text": "<a href=\"javascript:alert(1)\">alert(1)</a>"
->>>>>>> upstream/master
     }
 ]

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,5 @@`
`23`	`23`	`"id": 1464988717637,`
`24`	`24`	`"author": "evil",`
`25`	`25`	`"text": "<a href=\"javascript:alert(1)\">alert(1)</a>"`
`26`		`->>>>>>> upstream/master`
`27`	`26`	`}`
`28`	`27`	`]`