Compare commits

...

3 Commits

Author SHA1 Message Date
Petruspistor 51393188fb fixing conflicts and merging 2025-08-09 01:12:18 -07:00
Petruspistor bd90295763 adding images 2025-08-09 01:03:52 -07:00
Petruspistor 94bafbd60d removing nav and added pp.img 2025-08-09 01:01:16 -07:00
2 changed files with 5 additions and 0 deletions
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 312 KiB

+5
View File
@@ -13,6 +13,7 @@
<body> <body>
<header> <header>
<h3>Peter Baker</h3> <h3>Peter Baker</h3>
<img src="img/pp.jpg" width="200" />
</header> </header>
<!--<nav> <!--<nav>
@@ -21,6 +22,9 @@
<li>Projects</li> <li>Projects</li>
<li>Contact</li> <li>Contact</li>
</ul> </ul>
<<<<<<< HEAD
</nav>
=======
</nav>--> </nav>-->
<main> <main>
@@ -39,5 +43,6 @@
</p> </p>
</article> </article>
</main> </main>
>>>>>>> c8000e41cc15a76985524dc31fcd32ba8e56f6f8
</body> </body>
</html> </html>