Merge remote-tracking branch 'origin/main'

tanmayc43 · Dec 9, 2024 · 0a6d4e3 · 0a6d4e3
2 parents b0908c0 + 2724b47
commit 0a6d4e3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CNAME b/CNAME
@@ -0,0 +1 @@
+www.tanmay.works
diff --git a/README.md b/README.md
@@ -1,3 +1,9 @@
+<<<<<<< HEAD
 # portfolio
 
-Personal Portfolio website
+Personal Portfolio website
+=======
+# Portfolio
+
+Personal Portfolio Website
+>>>>>>> origin/main
diff --git a/index.html b/index.html
@@ -103,7 +103,7 @@ <h2>Portfolio</h2>
                     <img src="./assets/project-2.png" alt="Project 2" class="project-img">
                     <div class="btn-container">
                         <button class="btn btn-color-2" onclick="location.href='https://github.com/tanmayc43/portfolio'">Github</button>
-                        <button class="btn btn-color-2" onclick="location.href='https://github.com/'">Live Demo</button>
+                        <button class="btn btn-color-2" onclick="location.href='https://tanmay.works/'">Live Demo</button>
                     </div>
                     <div class="project-description">
                         <p>Created a responsive portfolio website using <strong>HTML, CSS & JavaScript</strong>. Integrated the <strong>NASA API</strong> to display the "Picture of the Day" with a dynamic description toggle. The website features smooth navigation and a contact form for users to reach out.</p>
@@ -163,4 +163,4 @@ <h2>NASA's Picture of the Day ‧₊˚✩彡</h2>
     </footer>
     <script src="script.js"></script>
 </body>
-</html>
+</html>