resolving conflicts

marsidev · Aug 5, 2022 · 40ec7df · 40ec7df
2 parents ab43e9c + c707a2b
commit 40ec7df
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/data/svgs.json b/data/svgs.json
@@ -497,21 +497,48 @@
  "url": "https://notion.so/"
  },
  {
- "id": 72,
+ "slug": "/library/nestjs.svg",
+ "title": "NestJS",
+ "category": "Framework",
+ "url": "https://nestjs.com/"
+ },
+ {
+ "id": 73,
+ "slug": "/library/copilot.svg",
+ "title": "Github Copilot",
+ "category": "Software",
+ "url": "https://github.com/features/copilot"
+ },
+ {
+ "id": 74,
+ "slug": "/library/railway.svg",
+ "title": "Railway",
+ "category": "Software",
+ "url": "https://railway.app/"
+ },
+ {
+ "id": 75,
+ "slug": "/library/docusaurus.svg",
+ "title": "Docusaurus",
+ "category": "Software",
+ "url": "https://docusaurus.io/"
+ },
+ {
+ "id": 76,
  "slug": "/library/twitch.svg",
  "title": "Twitch",
  "category": "Entertainment",
  "url": "https://twitch.tv"
  },
  {
- "id": 73,
+ "id": 77,
  "slug": "/library/godaddy.svg",
  "title": "GoDaddy",
  "category": "Hosting",
  "url": "https://www.godaddy.com/"
  },
  {
- "id": 74,
+ "id": 78,
  "slug": "/library/udemy.svg",
  "title": "Udemy",
  "category": "Education",

diff --git a/public/library/copilot.svg b/public/library/copilot.svg
diff --git a/public/library/docusaurus.svg b/public/library/docusaurus.svg
diff --git a/public/library/nestjs.svg b/public/library/nestjs.svg
diff --git a/public/library/railway.svg b/public/library/railway.svg