resolving conflicts

This commit is contained in:
Savitha Raghunathan
2020-07-19 19:15:36 -04:00
255 changed files with 7212 additions and 4368 deletions
-1
View File
@@ -153,7 +153,6 @@ css = [
"custom-jekyll/tags"
]
js = [
"custom-jekyll/tags",
"script"
]