From 2fdd7f40f03cc39245a1599404db766fb601b77b Mon Sep 17 00:00:00 2001 From: Ro Date: Tue, 4 Jan 2022 13:47:55 -0800 Subject: [PATCH] cleared conflict with git ignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 980c9cd..bef0b03 100644 --- a/.gitignore +++ b/.gitignore @@ -15,9 +15,10 @@ public/assets/css/* !public/assets/css/dash.css !public/assets/scripts public/assets/scripts/* -!public/assets/scripts/dash.min.js +!public/assets/scripts/Start.js /public/assets/images/global/rikc-logo.svg + !public/assets/images public/assets/images/* !public/assets/images/global/