updated resume

jayshreee10 · Apr 10, 2024 · 3fc52db · 3fc52db
2 parents 5e9ce5d + 8e20e4c
commit 3fc52db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/README.md b/README.md
diff --git a/root/index.html b/root/index.html
@@ -42,7 +42,11 @@ <h1>Jayshree</h1>
                         <a href="https://x.com/SadangiJayshre" target="_blank"><button class="x"><img src="assets/Twitter Logo Icon 1.svg" alt="" srcset=""></button></a>
                         <a href="https://open.spotify.com/playlist/3q0cAQ8r3S0JPFvBR2D9bT" target="_blank"><button class="spotify"><img src="assets/spotify 1 .svg " alt=" " srcset=" "></button></a>
                     </div> 
+<<<<<<< HEAD
                     <div class="row5"><a href="https://drive.google.com/file/d/1EpgOUTOKiXqJb5LZuUCO1mMidOodflSY/view?usp=drive_link" target="_blank"><button class="resume"><b>Resume</b> <img src="assets/link_icon.png" alt=" " srcset=" "></button></a></div></a>
+=======
+                    <div class="row5"><a href="https://drive.google.com/file/d/1EpgOUTOKiXqJb5LZuUCO1mMidOodflSY/view" target="_blank"><button class="resume"><b>Resume</b> <img src="assets/link_icon.png" alt=" " srcset=" "></button></a></div></a>
+>>>>>>> 8e20e4caeb34014798dd05e116cb0fdf01d169da
                 <div class="DND"><p><a href="https://www.figma.com/file/wivJil7EHwxWUz9yiVZpYW/Jayce-link" target="_blank"><u>designed</u></a> and <a href="https://github.com/jayshreee10/Link-tree" target="_blank"><u>developed </u></a> with 💜</p></div>
             </div>
             </div>     
@@ -72,4 +76,4 @@ <h1>Jayshree</h1>
         const analytics = getAnalytics(app);
       </script>
 </body>
-</html>
+</html>