Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	components/Footer.js
#	index.css
#	package.json
  • Loading branch information
proficientdesigners committed Jan 21, 2023
2 parents f6cbef9 + b68046f commit 5c0bd5e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/node_modules
/node_modules
.DS_Store

0 comments on commit 5c0bd5e

Please sign in to comment.