src/tailwind.css

@@ -686,3 +686,11 @@ Ensure the default browser behavior of the `hidden` attribute.
 .last\:mb-0:last-child {
   margin-bottom: 0px;
 }
+<<<<<<< HEAD
+
+@font-face {
+  font-family: "FangSong_GB2312"; /* Project id  */
+  src: url('./font/FSGB2312.ttf');/* Safari, Android, iOS */
+}
+=======
+>>>>>>> fac0ecd875f55a0e75e68d0d3a5ebd9bb4d8e90f