Loading .gitignore +2 −0 Original line number Diff line number Diff line Loading @@ -2,3 +2,5 @@ __pycache__/ .vscode/ .~lock.spam.csv# web/index.html +0 −5 Original line number Diff line number Diff line <<<<<<< Updated upstream <h1>Larry was here</h1> ======= <h1>Larry the loser likes losing lots of likes on Facebook</h1> >>>>>>> Stashed changes Loading
.gitignore +2 −0 Original line number Diff line number Diff line Loading @@ -2,3 +2,5 @@ __pycache__/ .vscode/ .~lock.spam.csv#
web/index.html +0 −5 Original line number Diff line number Diff line <<<<<<< Updated upstream <h1>Larry was here</h1> ======= <h1>Larry the loser likes losing lots of likes on Facebook</h1> >>>>>>> Stashed changes