Skip to content

Commit

Permalink
fix(mwpw-131582): final merge stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Sheridan Sunier committed Mar 12, 2024
1 parent 09776f9 commit 9618601
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 20 deletions.
6 changes: 1 addition & 5 deletions dist/app.css

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions dist/main.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
/*!
<<<<<<< HEAD
* Chimera UI Libraries - Build 0.11.13 (3/7/2024, 14:57:25)
=======
* Chimera UI Libraries - Build 0.11.12 (3/12/2024, 14:33:25)
>>>>>>> 7d4749f (fix(mwpw-131582): makes carousel accessible to screenreaders)
* Chimera UI Libraries - Build 0.11.14 (3/12/2024, 15:18:00)
*
*/
/******/ (function(modules) { // webpackBootstrap
Expand Down
12 changes: 2 additions & 10 deletions dist/main.min.js

Large diffs are not rendered by default.

0 comments on commit 9618601

Please sign in to comment.