Skip to content

Commit

Permalink
Removed git merge symbols
Browse files Browse the repository at this point in the history
  • Loading branch information
@nbaars
Tobias-Melzer authored and nbaars committed Mar 26, 2019
1 parent 2d5919d commit a8106f6
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,5 @@ network.request=You made a HTTP Request.
network.success=Correct, Well Done.
network.failed=That is not correct, try again.

<<<<<<< HEAD
networkHint1=Clear all Requests from the network button, then make the request. The you should be able to figure out, which request holds the data.
networkHint2=The name of the request is "dummy"
=======
networkHint1=Clear all Requests from the network tab, then make the request. The you should be able to figure out, which request holds the data.
networkHint2=The name of the request is "dummy"
>>>>>>> Implemented some feedback

0 comments on commit a8106f6

Please sign in to comment.