aboutsummaryrefslogtreecommitdiffstats
path: root/postcss.config.js
diff options
context:
space:
mode:
authorJeff <jeffkleinaitis@gmail.com>2024-04-09 15:09:29 -0400
committerJeff <jeffkleinaitis@gmail.com>2024-04-09 15:09:29 -0400
commit2374eae054935dd49adf3f0e29e8bea0876288f4 (patch)
tree82cb8cff09b822117b26cc512763c32eeaa75a39 /postcss.config.js
parent7c2574f1985cddba1e6fa6fcc6f8e1c019aaf7ed (diff)
parentccf52d88eb60f518cc3e5bb3ce2b21bbb6858337 (diff)
Resolve merge conflicts
Diffstat (limited to 'postcss.config.js')
-rw-r--r--postcss.config.js9
1 files changed, 9 insertions, 0 deletions
diff --git a/postcss.config.js b/postcss.config.js
index 33ad091..0409611 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,6 +1,15 @@
+<<<<<<< HEAD
+=======
+// If you want to use other PostCSS plugins, see the following:
+// https://tailwindcss.com/docs/using-with-preprocessors
+>>>>>>> ccf52d88eb60f518cc3e5bb3ce2b21bbb6858337
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
+<<<<<<< HEAD
}
+=======
+};
+>>>>>>> ccf52d88eb60f518cc3e5bb3ce2b21bbb6858337