diff --git a/.gitignore b/.gitignore index 59c5e356f4..5a7f85feb7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ node_modules/ .vscode -site/ \ No newline at end of file +site/ +<<<<<<< HEAD +.DS_Store +======= +.DS_Store +>>>>>>> 2b3114cc9 (removed .DS_Store) diff --git a/about/about/index.html b/about/about/index.html index 416d90489f..848bd7e995 100644 --- a/about/about/index.html +++ b/about/about/index.html @@ -3,7 +3,7 @@