From f728f0c4cd9b9f81e59c7975df98abdb39a275bb Mon Sep 17 00:00:00 2001 From: b1ek Date: Sun, 7 May 2023 16:37:27 +1000 Subject: [PATCH] attempt to fix conflict --- pairent_frontend_react/src/{App.js => App.jsx} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pairent_frontend_react/src/{App.js => App.jsx} (100%) diff --git a/pairent_frontend_react/src/App.js b/pairent_frontend_react/src/App.jsx similarity index 100% rename from pairent_frontend_react/src/App.js rename to pairent_frontend_react/src/App.jsx