Resolved merge conflicts

Richjerk · May 24, 2024 · adc8cd0 · adc8cd0
1 parent 8e7f759
commit adc8cd0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/_config.yml b/_config.yml
@@ -0,0 +1,12 @@
+# Required variables
+title: "Township Small Business Chatbot"
+description: "A chatbot to assist small businesses in the township area."
+
+# Optional variables
+show_downloads: false
+google_analytics: G-PLZZBJYL24
+
+
+
+
+
diff --git a/assets/css/style.scss b/assets/css/style.scss
@@ -0,0 +1,19 @@
+------@import "{{ site.theme }}";
+
+/* style.css */
+body {
+    font-family: 'Arial', sans-serif;
+}
+.stButton>button {
+    background-color: #4CAF50;
+    color: white;
+    border: none;
+    padding: 10px 24px;
+    text-align: center;
+    text-decoration: none;
+    display: inline-block;
+    font-size: 16px;
+    margin: 4px 2px;
+    cursor: pointer;
+    border-radius: 12px;
+}