dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed git merge symbols

Browse Source
This commit is contained in:
Tobias-Melzer 2019-03-01 20:48:22 +01:00 committed by Nanne Baars
parent 2d5919dfc6
commit a8106f6671
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties
View File

@ -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