resolve conflicts

gitcoinco · Jun 15, 2021 · 35979d4 · 35979d4
2 parents 9ba3ad5 + 99d3c1a
commit 35979d4
Show file tree

Hide file tree

Showing 2 changed files with 280 additions and 2 deletions.
diff --git a/app/dashboard/templates/legal/privacy.html b/app/dashboard/templates/legal/privacy.html
diff --git a/app/retail/templates/about.html b/app/retail/templates/about.html