From 9f083e771c8dd7047525eec9499b9ca4824b3772 Mon Sep 17 00:00:00 2001
From: "dennis.ludwig" <dennis.ludwig@aoe.com>
Date: Thu, 17 Jun 2021 14:38:23 +0200
Subject: [PATCH] Merge branch 'main' into
 separateNonFeaturedArticlesOnQuadrantView

# Conflicts:
#	.lintstagedrc
#	dist_scripts/src/model.js
#	src/animation.ts
#	src/components/Item/Item.tsx
#	src/components/ItemList/ItemList.tsx
#	src/components/PageItem/PageItem.tsx
#	src/index.scss
#	src/model.js
#	src/model.ts
---
 .lintstagedrc | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 .lintstagedrc

diff --git a/.lintstagedrc b/.lintstagedrc
deleted file mode 100644
index a6ccf61..0000000
--- a/.lintstagedrc
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "*.{json, md, yml, js, ts, tsx, scss}": [
-        "prettier --write",
-    ]
-}