From 570f94864f88ec02a57aecc0c7df928be91f5449 Mon Sep 17 00:00:00 2001 From: JonathanHerrewijnen Date: Mon, 17 Feb 2020 11:11:29 +0100 Subject: [PATCH] simulating merge error --- Website/Website/ClientApp/src/App.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Website/Website/ClientApp/src/App.js b/Website/Website/ClientApp/src/App.js index 16c7783..271d0d8 100644 --- a/Website/Website/ClientApp/src/App.js +++ b/Website/Website/ClientApp/src/App.js @@ -16,6 +16,7 @@ export default class App extends Component { + ); }