merge

1 files changed, 0 insertions, 170 deletions

diff --git a/old/doodle.html b/old/doodle.html
index a49d926..f71878a 100644
--- a/old/doodle.html
+++ b/old/doodle.html
@@ -31,7 +31,6 @@
 
     <div class="art-container">
         <h4>2025</h4>
-<<<<<<< HEAD
         <img loading="lazy" src="../img/art/2025/s2.jpg">
         <img loading="lazy" src="../img/art/2025/s3.jpg">
         <img loading="lazy" src="../img/art/2025/s4.jpg">
@@ -199,175 +198,6 @@
 	<img loading="lazy" src="../img/art/2022/kaiba.jpg">
 	<h4>2021</h4>
 	<img loading="lazy" src="../img/art/2021/Aubreyfull.jpg">
-=======
-        <img loading="lazy" src="../img/art/2025/s2.jpg">
-        <img loading="lazy" src="../img/art/2025/s3.jpg">
-        <img loading="lazy" src="../img/art/2025/s4.jpg">
-        <img loading="lazy" src="../img/art/2025/h1.jpg">
-        <img loading="lazy" src="../img/art/2025/h2.jpg">
-        <img loading="lazy" src="../img/art/2025/h3.jpg">
-        <img loading="lazy" src="../img/art/2025/h4.jpg">
-        <img loading="lazy" src="../img/art/2025/h5.jpg">
-	<img loading="lazy" src="../img/art/2025/gen.jpg">
-	<img loading="lazy" src="../img/art/2025/gen2.jpg">
-	<img loading="lazy" src="../img/art/2025/girl.jpg">
-        <img loading="lazy" src="../img/art/2025/girls.jpg">
-        <img loading="lazy" src="../img/art/2025/grenoille.jpg">
-        <img loading="lazy" src="../img/art/2025/gren.jpg">
-	<img loading="lazy" src="../img/art/2025/chan.jpg">
-        <img loading="lazy" src="../img/art/2025/IMG_20250225_190837.jpg">
-        <img loading="lazy" src="../img/art/2025/IMG_20250225_190555.jpg">
-        <img loading="lazy" src="../img/art/2025/IMG_20250225_190527.jpg">
-        <img loading="lazy" src="../img/art/2025/IMG_20250225_190516.jpg">
-        <img loading="lazy" src="../img/art/2025/website.png">
-        <h4>2024</h4>
-        <img loading="lazy" src="../img/art/2024/weenergender.png">
-        <img loading="lazy" src="../img/art/2024/thething.png">
-        <img loading="lazy" src="../img/art/2024/theprotag.png">
-        <img loading="lazy" src="../img/art/2024/the experience.png">
-        <img loading="lazy" src="../img/art/2024/stars.png">
-        <img loading="lazy" src="../img/art/2024/skin.png">
-        <img loading="lazy" src="../img/art/2024/skedaddleaway.png">
-        <img loading="lazy" src="../img/art/2024/TIME.png">
-        <img loading="lazy" src="../img/art/2024/poster texture cool.jpg">
-        <img loading="lazy" src="../img/art/2024/my wires.png">
-        <img loading="lazy" src="../img/art/2024/molochhelp.gif">
-        <img loading="lazy" src="../img/art/2024/molochand me.gif">
-        <img loading="lazy" src="../img/art/2024/moldoodles.png">
-        <img loading="lazy" src="../img/art/2024/mithrundoodle.png">
-        <img loading="lazy" src="../img/art/2024/mithrun3.jpg">
-        <img loading="lazy" src="../img/art/2024/mithrun2.jpg">
-        <img loading="lazy" src="../img/art/2024/mithrun.GIF">
-        <img loading="lazy" src="../img/art/2024/lips.png">
-        <img loading="lazy" src="../img/art/2024/laiosSHIRT.jpg">
-        <img loading="lazy" src="../img/art/2024/jig.gif">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224938.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224932.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224926.jpg">
-	<img loading="lazy" src="../img/art/2024/IMG_20240718_224814.jpg">
-	<img loading="lazy" src="../img/art/2024/IMG_20240718_224815.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224914.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224904.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224835.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224828.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224758.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224657.jpg">
-        <img loading="lazy" src="../img/art/2024/IMG_20240718_224638.jpg">
-        <img loading="lazy" src="../img/art/2024/ill.png">
-        <img loading="lazy" src="../img/art/2024/guts.png">
-        <img loading="lazy" src="../img/art/2024/gregemup.png">
-        <img loading="lazy" src="../img/art/2024/godot.png">
-        <img loading="lazy" src="../img/art/2024/gamedoodles.png">
-        <img loading="lazy" src="../img/art/2024/die.png">
-        <img loading="lazy" src="../img/art/2024/d.png">
-        <img loading="lazy" src="../img/art/2024/wegh.png">
-        <img loading="lazy" src="../img/art/2024/cant.png">
-        <img loading="lazy" src="../img/art/2024/and your relationships will fall apart c.png">
-        <img loading="lazy" src="../img/art/2024/2024 - Jan 23.jpg">
-        <img loading="lazy" src="../img/art/2024/2024 - Jan23 googles.png">
-        <img loading="lazy" src="../img/art/2024/2024 - Feb2.jpg">
-        <h4>2023</h4>
-        <img loading="lazy" src="../img/art/2023/whathehell.png">
-        <img loading="lazy" src="../img/art/2023/whatami.png">
-        <img loading="lazy" src="../img/art/2023/weird girl.png">
-        <img loading="lazy" src="../img/art/2023/update.png">
-        <img loading="lazy" src="../img/art/2023/typing.png">
-        <img loading="lazy" src="../img/art/2023/thoughts.png">
-        <img loading="lazy" src="../img/art/2023/the me tunrb 3.png">
-        <img loading="lazy" src="../img/art/2023/spaghettblur2.png">
-        <img loading="lazy" src="../img/art/2023/Sleep.png">
-        <img loading="lazy" src="../img/art/2023/September18 3.jpg">
-        <img loading="lazy" src="../img/art/2023/September18 2.jpg">
-        <img loading="lazy" src="../img/art/2023/September18 1.jpg">
-        <img loading="lazy" src="../img/art/2023/September18.jpg">
-	<img loading="lazy" src="../img/art/2023/September 4.png">
-        <img loading="lazy" src="../img/art/2023/scdumbrella.png">
-        <img loading="lazy" src="../img/art/2023/philosophy.png">
-        <img loading="lazy" src="../img/art/2023/person.png">
-        <img loading="lazy" src="../img/art/2023/people.png">
-        <img loading="lazy" src="../img/art/2023/November 2 2.jpg">
-        <img loading="lazy" src="../img/art/2023/momsjacket2.png">
-        <img loading="lazy" src="../img/art/2023/minmax.png">
-        <img loading="lazy" src="../img/art/2023/meshakeart.gif">
-        <img loading="lazy" src="../img/art/2023/me reference.png">
-        <img loading="lazy" src="../img/art/2023/me1.png">
-        <img loading="lazy" src="../img/art/2023/lighter.png">
-        <img loading="lazy" src="../img/art/2023/klaabu.jpg">
-        <img loading="lazy" src="../img/art/2023/June14 - dump2.jpg">
-        <img loading="lazy" src="../img/art/2023/jan29.png">
-        <img loading="lazy" src="../img/art/2023/inanna.png">
-        <img loading="lazy" src="../img/art/2023/imtheworst.png">
-        <img loading="lazy" src="../img/art/2023/IMG_20240718_224346.jpg">
-        <img loading="lazy" src="../img/art/2023/IMG_20240718_224336.jpg">
-        <img loading="lazy" src="../img/art/2023/IMG_20240718_224332.jpg">
-        <img loading="lazy" src="../img/art/2023/IMG_20231214_095534_edit_61702316709854.jpg">
-        <img loading="lazy" src="../img/art/2023/IMG_20240718_224150.jpg">
-	<img loading="lazy" src="../img/art/2023/IMG_20240718_224151.jpg">
-        <img loading="lazy" src="../img/art/2023/IMG_20230423_095740_edit_386787025095667.jpg">
-        <img loading="lazy" src="../img/art/2023/IMG_20230224_082257_edit_195344615689983.jpg">
-        <img loading="lazy" src="../img/art/2023/IMG_20230224_082251_edit_195280928687909.jpg">
-        <img loading="lazy" src="../img/art/2023/hylics looking ass.png">
-        <img loading="lazy" src="../img/art/2023/halftone.png">
-        <img loading="lazy" src="../img/art/2023/hair.png">
-        <img loading="lazy" src="../img/art/2023/gregsplat2.png">
-        <img loading="lazy" src="../img/art/2023/gregdespair2.png">
-        <img loading="lazy" src="../img/art/2023/goodday.png">
-        <img loading="lazy" src="../img/art/2023/girly.png">
-        <img loading="lazy" src="../img/art/2023/gegheff.png">
-        <img loading="lazy" src="../img/art/2023/gah.png">
-        <img loading="lazy" src="../img/art/2023/fursona.png">
-        <img loading="lazy" src="../img/art/2023/funkyproportions.png">
-        <img loading="lazy" src="../img/art/2023/fuckedup.png">
-        <img loading="lazy" src="../img/art/2023/freak.png">
-        <img loading="lazy" src="../img/art/2023/estshirt2.png">
-        <img loading="lazy" src="../img/art/2023/estoniapride.png">
-        <img loading="lazy" src="../img/art/2023/duckfull.png">
-        <img loading="lazy" src="../img/art/2023/distraught.png">
-        <img loading="lazy" src="../img/art/2023/departure.png">
-        <img loading="lazy" src="../img/art/2023/December18.jpg">
-	<h4>Stout .. Identity Start</h4>
-        <img loading="lazy" src="../img/art/2023/Dec 15.jpg">
-        <img loading="lazy" src="../img/art/2023/Dec 15 - 1.jpg">
-        <img loading="lazy" src="../img/art/2023/Dec 15 - 2.jpg">
-        <img loading="lazy" src="../img/art/2023/Dec 15 - 3.jpg">
-        <img loading="lazy" src="../img/art/2023/Dec 15 - 4.jpg">
-        <img loading="lazy" src="../img/art/2023/Dec 15 - 5.jpg">
-        <img loading="lazy" src="../img/art/2023/Dec 15 - 6.jpg">
-        <img loading="lazy" src="../img/art/2023/Dec 15 - 7.jpg">
-	<h4>Stout ... Identity End</h4>
-        <img loading="lazy" src="../img/art/2023/deal.png">
-        <img loading="lazy" src="../img/art/2023/coolending.png">
-        <img loading="lazy" src="../img/art/2023/compeeter.png">
-        <img loading="lazy" src="../img/art/2023/circle.png">
-        <img loading="lazy" src="../img/art/2023/catboyreigenfixed.png">
-        <img loading="lazy" src="../img/art/2023/can't find it.png">
-        <img loading="lazy" src="../img/art/2023/brutal.png">
-        <img loading="lazy" src="../img/art/2023/break.png">
-        <img loading="lazy" src="../img/art/2023/aoigarasudama.png">
-        <img loading="lazy" src="../img/art/2023/anatomysketches.png">
-        <h4>2022</h4>
-        <img loading="lazy" src="../img/art/2022/TabletTestCrop1.png">
-        <img loading="lazy" src="../img/art/2022/signed.png">
-        <img loading="lazy" src="../img/art/2022/IMG_20230703_204745.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20230703_204841.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_224600.jpg">
-	<img loading="lazy" src="../img/art/2022/linkdoodle.jpg">
-	<h5>Comic start</h5>
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_223338.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_223342.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_223347.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_223352.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_223357.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_223400.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20240718_223403.jpg">
-	<h5>Comic end</h5>
-        <img loading="lazy" src="../img/art/2022/IMG_20221019_220521_edit_150902434438431.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20220411_202438.jpg">
-        <img loading="lazy" src="../img/art/2022/IMG_20220411_165337.jpg">
-	<img loading="lazy" src="../img/art/2022/kaiba.jpg">
-	<h4>2021</h4>
-	<img loading="lazy" src="../img/art/2021/Aubreyfull.jpg">
->>>>>>> 60eb045c37c24677088f13cdded9408c292f65ff
     </div>
 </body>
 </html>