resolve conflicts

PriyaGhosal · Oct 31, 2024 · 37fbfdf · 37fbfdf
1 parent 2ddb5ea
commit 37fbfdf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/Faq.html b/Faq.html
@@ -277,7 +277,7 @@ <h1 data-aos="zoom-in">
 
     <div class="footer-bottom footer-bottom-faq">
         <div class="container">
-          <p class="copyright">
+          <p class="copyright" style="font-weight: bolder;  color: black;">
             <a href="copy.html"> © Copyright Policy <time id="year"></time> </a> All Rights Reserved by Priya Ghosal
             <br>
             Made with ♥ by Priya Ghosal

diff --git a/assets/css/Faq.css b/assets/css/Faq.css
@@ -182,9 +182,4 @@
 
 body {
   overflow-y: auto; /* Enable vertical scroll */
-}
-
-.footer-bottom-faq p{
-  font-weight: bolder;
-  color: black;
 }