Revert "feat: merge conflicts"

This reverts commit 73ec807dd3, reversing changes made to 62cfecc456.
2023-01-23 14:51:21 -05:00
parent 73ec807dd3
commit bafc3c8de8
144 changed files with 3410 additions and 4072 deletions
--- a/src/setupTest.js
+++ b/src/setupTest.js
@@ -80,7 +80,6 @@ jest.mock('@edx/paragon', () => jest.requireActual('testUtils').mockNestedCompon
    Footer: 'Card.Footer',
    Body: 'Card.Body',
  },
-  Col: 'Col',
  Container: 'Container',
  Dropdown: {
    Item: 'Dropdown.Item',