Resolve merge conflict on main

PRX · Apr 26, 2023 · 8276d1d · 8276d1d
1 parent 4b0c192
commit 8276d1d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/app/assets/stylesheets/app/index.scss b/app/assets/stylesheets/app/index.scss
@@ -2,3 +2,4 @@
 
 @import "audio-segmenter/index";
 @import "calendar";
+@import "uploads";