diff --git a/computers.html b/computers.html index 76258c4d..aa1f054d 100644 --- a/computers.html +++ b/computers.html @@ -7,10 +7,24 @@ -

computers

+

new collection:

+ +

thinkpad t570

+
+ + mac pro + +
A used laptop I got cheap. It has a 2c4t i5-7600u, 16gb of ram, and a 256gb ssd. It's fine. +
+
+ + +

computers that were destroyed in the flood

+

all of these computers were destroyed in hurricane helene

+

main desktop

@@ -19,7 +33,16 @@ an open computer +<<<<<<< Updated upstream
My main pc. It's been upgraded to a ryzen 5 7600 from a ryzen 5 3600. It's got an rx 5700xt and 32gb of ddr5. I run endeavoros. +======= +<<<<<<< HEAD +
My main pc. It's been upgraded to a ryzen 5 7600 from a ryzen 5 3600. It's got an rx 5700xt and 32gb + of ddr5. I run endeavoros. +======= +
My main pc. It's been upgraded to a ryzen 5 7600 from a ryzen 5 3600. It's got an rx 5700xt and 32gb of ddr5. I run endeavoros. +>>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968 +>>>>>>> Stashed changes
@@ -67,7 +90,16 @@ mac pro showing the desktop --> +<<<<<<< Updated upstream
Planned to be my new nas, transferred from the 09 mac pro. Haven't gotten around to it yet. It has a xeon w-2135, which is a 6 core skylake chip. I gave it 32gb of ddr4 and 2 4tb hard drives. +======= +<<<<<<< HEAD +
Planned to be my new nas, transferred from the 09 mac pro. Haven't gotten around to it yet. It has a + xeon w-2135, which is a 6 core skylake chip. I gave it 32gb of ddr4 and 2 4tb hard drives. +======= +
Planned to be my new nas, transferred from the 09 mac pro. Haven't gotten around to it yet. It has a xeon w-2135, which is a 6 core skylake chip. I gave it 32gb of ddr4 and 2 4tb hard drives. +>>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968 +>>>>>>> Stashed changes
@@ -98,7 +130,16 @@ +<<<<<<< Updated upstream
a quicksilver model, it has a powerpc g4, some ram, and a cool scsi card. I haven't really been able to get this machine working. +======= +<<<<<<< HEAD +
a quicksilver model, it has a powerpc g4, some ram, and a cool scsi card. I haven't really been able + to get this machine working. +======= +
a quicksilver model, it has a powerpc g4, some ram, and a cool scsi card. I haven't really been able to get this machine working. +>>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968 +>>>>>>> Stashed changes
@@ -127,7 +168,16 @@ thinkpad --> +<<<<<<< Updated upstream
Looks like every early to mid thousands office dell. I don't even remember the model number. I slapped a xfx 7800gs in it for winxp gaming. Haven't used it much yet. +======= +<<<<<<< HEAD +
Looks like every early to mid thousands office dell. I don't even remember the model number. I + slapped a xfx 7800gs in it for winxp gaming. Haven't used it much yet. +======= +
Looks like every early to mid thousands office dell. I don't even remember the model number. I slapped a xfx 7800gs in it for winxp gaming. Haven't used it much yet. +>>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968 +>>>>>>> Stashed changes
@@ -136,8 +186,8 @@ tandy color computer 2 -
I haven't gotten a lot of work done with this machine, but I like it a lot! I've been meaning to set up - drivewire and do some code development.
+
I haven't gotten a lot of work done with this machine, but I like it a lot! I've been meaning to set + up drivewire and do some code development.

computers i no longer own

@@ -158,7 +208,16 @@ mac plus --> +<<<<<<< Updated upstream
I got a lot of compact macs, pluses and ses and stuff. Sold a lot of em off, and scrapped the unfixable ones. +======= +<<<<<<< HEAD +
I got a lot of compact macs, pluses and ses and stuff. Sold a lot of em off, and scrapped the + unfixable ones. +======= +
I got a lot of compact macs, pluses and ses and stuff. Sold a lot of em off, and scrapped the unfixable ones. +>>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968 +>>>>>>> Stashed changes
@@ -186,7 +245,15 @@
back home +<<<<<<< Updated upstream

Updated September 13th, 2024

+======= +<<<<<<< HEAD +

Updated October 4th, 2024

+======= +

Updated September 13th, 2024

+>>>>>>> 9620d2226b562cd18df820afe51146cfd2d94968 +>>>>>>> Stashed changes
diff --git a/index.html b/index.html index 2b998cfb..fd878ebe 100644 --- a/index.html +++ b/index.html @@ -25,8 +25,11 @@