fix(components): revert merge conflicts

Teradata · Jul 29, 2024 · 5208f9d · 5208f9d
1 parent 57e5e7a
commit 5208f9d
Show file tree

Hide file tree

Showing 185 changed files with 1,555 additions and 4,354 deletions.
diff --git a/apps/knapsack/data/blocks/block.0e-3KI4OGe.json b/apps/knapsack/data/blocks/block.0e-3KI4OGe.json
diff --git a/apps/knapsack/data/blocks/block.13BK0N6Qz3.json b/apps/knapsack/data/blocks/block.13BK0N6Qz3.json
diff --git a/apps/knapsack/data/blocks/block.1SH-8Nf4C1.json b/apps/knapsack/data/blocks/block.1SH-8Nf4C1.json
diff --git a/apps/knapsack/data/blocks/block.1gUvlXIinj.json b/apps/knapsack/data/blocks/block.1gUvlXIinj.json
diff --git a/apps/knapsack/data/blocks/block.65KfvQ3E.json b/apps/knapsack/data/blocks/block.65KfvQ3E.json
diff --git a/apps/knapsack/data/blocks/block.6mb82S5AW.json b/apps/knapsack/data/blocks/block.6mb82S5AW.json
diff --git a/apps/knapsack/data/blocks/block.7QOC5AFu6j.json b/apps/knapsack/data/blocks/block.7QOC5AFu6j.json
@@ -0,0 +1,24 @@
+{
+  "id": "7QOC5AFu6j",
+  "data": {
+    "guidelines": [
+      {
+        "id": "jFu2MXSQJ",
+        "type": "do",
+        "image": {
+          "alt": "Correct example of the user communicating to the interface: \"Show all my bookmarks\"",
+          "src": "https://knapsack.imgix.net/site/covalent/user-to-interface-communication-correct-xj2dzwqpxopng"
+        }
+      },
+      {
+        "id": "OeCwEeMs1Q",
+        "type": "dont",
+        "image": {
+          "alt": "Correct example of the user communicating to the interface: \"Show all your bookmarks\"",
+          "src": "https://knapsack.imgix.net/site/covalent/user-to-interface-communication-incorrect-ynny746gulpng"
+        }
+      }
+    ]
+  },
+  "blockType": "guidelines"
+}
diff --git a/apps/knapsack/data/blocks/block.7XuzLlOPj0.json b/apps/knapsack/data/blocks/block.7XuzLlOPj0.json
diff --git a/apps/knapsack/data/blocks/block.93TFv-Qzm.json b/apps/knapsack/data/blocks/block.93TFv-Qzm.json