diff --git a/webgoat-lessons/chrome-dev-tools/src/main/resources/html/ChromeDevTools.html b/webgoat-lessons/chrome-dev-tools/src/main/resources/html/ChromeDevTools.html index c22098ca8..abae8d0e5 100644 --- a/webgoat-lessons/chrome-dev-tools/src/main/resources/html/ChromeDevTools.html +++ b/webgoat-lessons/chrome-dev-tools/src/main/resources/html/ChromeDevTools.html @@ -35,9 +35,16 @@
+ +
+ + + +
+<<<<<<< HEAD +======= + + +>>>>>>> Added second assignment for chrome developer tools. \ No newline at end of file diff --git a/webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties b/webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties index ebe2341dc..3741c9cf5 100644 --- a/webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties +++ b/webgoat-lessons/chrome-dev-tools/src/main/resources/i18n/WebGoatLabels.properties @@ -8,4 +8,4 @@ network.success=Correct, Well Done. network.failed=That is not correct, try again. 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" \ No newline at end of file +networkHint2=The name of the request is "dummy"