Update content for html

1 files changed, 5 insertions, 63 deletions

diff --git a/uptime-stats.html b/uptime-stats.html
index da559ce0..e24c9654 100644
--- a/uptime-stats.html
+++ b/uptime-stats.html
@@ -13,11 +13,7 @@
 </p>
 <h1 style='display: inline' id='my-machine-uptime-stats'>My machine uptime stats</h1><br />
 <br />
-<<<<<<< HEAD
-<span class='quote'>This site was last updated at 2025-11-18T09:38:47+02:00</span><br />
-=======
-<span class='quote'>This site was last updated at 2025-11-09T12:53:12+02:00</span><br />
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
+<span class='quote'>This site was last updated at 2025-11-18T09:41:05+02:00</span><br />
 <br />
 <span>The following stats were collected via <span class='inlinecode'>uptimed</span> on all of my personal computers over many years and the output was generated by <span class='inlinecode'>guprecords</span>, the global uptime records stats analyser of mine.</span><br />
 <br />
@@ -39,32 +35,24 @@
 | Pos |           Host | Boots |                  Last Kernel |
 +-----+----------------+-------+------------------------------+
 |  1. |  alphacentauri |   671 |      FreeBSD 11.4-RELEASE-p7 |
-<<<<<<< HEAD
 |  2. |         *earth |   212 | Linux 6.17.7-300.fc43.x86_64 |
-=======
-|  2. |         *earth |   211 | Linux 6.17.5-300.fc43.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  3. |           mars |   207 |          Linux 3.2.0-4-amd64 |
 |  4. |       callisto |   153 |  Linux 4.0.4-303.fc22.x86_64 |
 |  5. |       dionysus |   136 |     FreeBSD 13.0-RELEASE-p11 |
 |  6. |      tauceti-e |   120 |          Linux 3.2.0-4-amd64 |
-<<<<<<< HEAD
 |  7. |      *makemake |    81 |  Linux 6.9.9-200.fc40.x86_64 |
-=======
-|  7. |      *makemake |    77 |  Linux 6.9.9-200.fc40.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  8. |            *f2 |    70 |         FreeBSD 14.3-RELEASE |
 |  9. |            *f1 |    65 |         FreeBSD 14.3-RELEASE |
 | 10. |            *f0 |    62 |         FreeBSD 14.3-RELEASE |
 | 11. |         uranus |    59 |                  NetBSD 10.1 |
 | 12. |          pluto |    51 |          Linux 3.2.0-4-amd64 |
-| 13. |   *mega-m3-pro |    50 |                Darwin 24.6.0 |
-| 14. |      mega15289 |    50 |                Darwin 23.4.0 |
+| 13. |      mega15289 |    50 |                Darwin 23.4.0 |
+| 14. |   *mega-m3-pro |    50 |                Darwin 24.6.0 |
 | 15. |    *fishfinger |    46 |                  OpenBSD 7.7 |
 | 16. |           t450 |    44 |         FreeBSD 14.2-RELEASE |
 | 17. |      *blowfish |    43 |                  OpenBSD 7.7 |
-| 18. |       mega8477 |    40 |                Darwin 13.4.0 |
-| 19. |         phobos |    40 |      Linux 3.4.0-CM-g1dd7cdf |
+| 18. |         phobos |    40 |      Linux 3.4.0-CM-g1dd7cdf |
+| 19. |       mega8477 |    40 |                Darwin 13.4.0 |
 | 20. |            sun |    33 |     FreeBSD 10.3-RELEASE-p24 |
 +-----+----------------+-------+------------------------------+
 </pre>
@@ -78,11 +66,7 @@
 | Pos |           Host |                      Uptime |                       Last Kernel |
 +-----+----------------+-----------------------------+-----------------------------------+
 |  1. |         vulcan |   4 years, 5 months, 6 days | Linux 3.10.0-1160.81.1.el7.x86_64 |
-<<<<<<< HEAD
 |  2. |         *earth | 3 years, 10 months, 26 days |      Linux 6.17.7-300.fc43.x86_64 |
-=======
-|  2. |         *earth | 3 years, 10 months, 22 days |      Linux 6.17.5-300.fc43.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  3. |      *blowfish |  3 years, 10 months, 2 days |                       OpenBSD 7.7 |
 |  4. |            sun |  3 years, 9 months, 26 days |          FreeBSD 10.3-RELEASE-p24 |
 |  5. |         uranus |   3 years, 9 months, 5 days |                       NetBSD 10.1 |
@@ -97,11 +81,7 @@
 | 14. |   *mega-m3-pro |  1 years, 5 months, 31 days |                     Darwin 24.6.0 |
 | 15. |       mega8477 |  1 years, 3 months, 25 days |                     Darwin 13.4.0 |
 | 16. |          host0 |   1 years, 3 months, 9 days |          FreeBSD 6.2-RELEASE-p5   |
-<<<<<<< HEAD
 | 17. |      *makemake |   1 years, 3 months, 7 days |       Linux 6.9.9-200.fc40.x86_64 |
-=======
-| 17. |      *makemake |   1 years, 3 months, 6 days |       Linux 6.9.9-200.fc40.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 | 18. |      tauceti-e |  1 years, 2 months, 20 days |               Linux 3.2.0-4-amd64 |
 | 19. |       callisto | 0 years, 10 months, 31 days |       Linux 4.0.4-303.fc22.x86_64 |
 | 20. |  alphacentauri | 0 years, 10 months, 28 days |           FreeBSD 11.4-RELEASE-p7 |
@@ -118,11 +98,7 @@
 +-----+----------------+-------+-----------------------------------+
 |  1. |         uranus |   340 |                       NetBSD 10.1 |
 |  2. |         vulcan |   275 | Linux 3.10.0-1160.81.1.el7.x86_64 |
-<<<<<<< HEAD
 |  3. |         *earth |   268 |      Linux 6.17.7-300.fc43.x86_64 |
-=======
-|  3. |         *earth |   268 |      Linux 6.17.5-300.fc43.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  4. |      *blowfish |   243 |                       OpenBSD 7.7 |
 |  5. |            sun |   238 |          FreeBSD 10.3-RELEASE-p24 |
 |  6. |          uugrn |   211 |           FreeBSD 11.2-RELEASE-p4 |
@@ -134,11 +110,7 @@
 | 12. |      mega15289 |   147 |                     Darwin 23.4.0 |
 | 13. |        tauceti |   141 |               Linux 3.2.0-4-amd64 |
 | 14. |      *makemake |   139 |       Linux 6.9.9-200.fc40.x86_64 |
-<<<<<<< HEAD
 | 15. |           t450 |   119 |              FreeBSD 14.2-RELEASE |
-=======
-| 15. |          *t450 |   122 |              FreeBSD 14.2-RELEASE |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 | 16. |      tauceti-f |   108 |               Linux 3.2.0-3-amd64 |
 | 17. |   *mega-m3-pro |    96 |                     Darwin 24.6.0 |
 | 18. |      tauceti-e |    96 |               Linux 3.2.0-4-amd64 |
@@ -158,11 +130,7 @@
 |  1. |       dionysus |  8 years, 3 months, 16 days |     FreeBSD 13.0-RELEASE-p11 |
 |  2. |         uranus |  6 years, 7 months, 31 days |                  NetBSD 10.1 |
 |  3. |  alphacentauri | 5 years, 11 months, 18 days |      FreeBSD 11.4-RELEASE-p7 |
-<<<<<<< HEAD
 |  4. |      *makemake |  3 years, 8 months, 11 days |  Linux 6.9.9-200.fc40.x86_64 |
-=======
-|  4. |      *makemake |   3 years, 8 months, 4 days |  Linux 6.9.9-200.fc40.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  5. |           moon |   2 years, 1 months, 1 days |      FreeBSD 14.0-RELEASE-p3 |
 |  6. |       callisto |  1 years, 5 months, 15 days |  Linux 4.0.4-303.fc22.x86_64 |
 |  7. |      mega15289 |  1 years, 4 months, 24 days |                Darwin 23.4.0 |
@@ -193,15 +161,9 @@
 |  1. |         uranus |  10 years, 4 months, 5 days |                       NetBSD 10.1 |
 |  2. |       dionysus |  8 years, 6 months, 17 days |          FreeBSD 13.0-RELEASE-p11 |
 |  3. |  alphacentauri |  6 years, 9 months, 13 days |           FreeBSD 11.4-RELEASE-p7 |
-<<<<<<< HEAD
 |  4. |      *makemake | 4 years, 10 months, 16 days |       Linux 6.9.9-200.fc40.x86_64 |
 |  5. |         vulcan |   4 years, 5 months, 6 days | Linux 3.10.0-1160.81.1.el7.x86_64 |
 |  6. |         *earth |  4 years, 4 months, 23 days |      Linux 6.17.7-300.fc43.x86_64 |
-=======
-|  4. |      *makemake |  4 years, 10 months, 8 days |       Linux 6.9.9-200.fc40.x86_64 |
-|  5. |         vulcan |   4 years, 5 months, 6 days | Linux 3.10.0-1160.81.1.el7.x86_64 |
-|  6. |         *earth |  4 years, 4 months, 11 days |      Linux 6.17.5-300.fc43.x86_64 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  7. |      *blowfish |  3 years, 10 months, 3 days |                       OpenBSD 7.7 |
 |  8. |            sun |  3 years, 10 months, 2 days |          FreeBSD 10.3-RELEASE-p24 |
 |  9. |          uugrn |   3 years, 5 months, 5 days |           FreeBSD 11.2-RELEASE-p4 |
@@ -230,11 +192,7 @@
 |  1. |  FreeBSD 10... |   551 |
 |  2. |     Linux 3... |   550 |
 |  3. | *FreeBSD 14... |   215 |
-<<<<<<< HEAD
 |  4. |    *Linux 6... |   197 |
-=======
-|  4. |    *Linux 6... |   192 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  5. |     Linux 5... |   162 |
 |  6. |     Linux 4... |   161 |
 |  7. |  FreeBSD 11... |   153 |
@@ -266,11 +224,7 @@
 |  2. |  *OpenBSD 7... |   7 years, 6 months, 29 days |
 |  3. |  FreeBSD 10... |    5 years, 9 months, 9 days |
 |  4. |     Linux 5... |  4 years, 10 months, 21 days |
-<<<<<<< HEAD
 |  5. |    *Linux 6... |   3 years, 1 months, 24 days |
-=======
-|  5. |    *Linux 6... |   3 years, 1 months, 19 days |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  6. |     Linux 4... |   2 years, 7 months, 22 days |
 |  7. |  FreeBSD 11... |   2 years, 4 months, 28 days |
 |  8. | *FreeBSD 14... |   2 years, 3 months, 24 days |
@@ -301,11 +255,7 @@
 |  2. |  *OpenBSD 7... |   484 |
 |  3. |  FreeBSD 10... |   406 |
 |  4. |     Linux 5... |   317 |
-<<<<<<< HEAD
 |  5. |    *Linux 6... |   213 |
-=======
-|  5. |    *Linux 6... |   211 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  6. |     Linux 4... |   175 |
 |  7. | *FreeBSD 14... |   161 |
 |  8. |  FreeBSD 11... |   159 |
@@ -332,11 +282,7 @@
 +-----+------------+-------+
 | Pos | KernelName | Boots |
 +-----+------------+-------+
-<<<<<<< HEAD
 |  1. |     *Linux |  1092 |
-=======
-|  1. |     *Linux |  1087 |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  2. |   *FreeBSD |  1080 |
 |  3. |    *Darwin |   155 |
 |  4. |   *OpenBSD |   109 |
@@ -352,11 +298,7 @@
 +-----+------------+-----------------------------+
 | Pos | KernelName |                      Uptime |
 +-----+------------+-----------------------------+
-<<<<<<< HEAD
 |  1. |     *Linux | 28 years, 2 months, 16 days |
-=======
-|  1. |     *Linux | 28 years, 2 months, 11 days |
->>>>>>> 23684983597db8c75bfa5f026bfc044915db48c3
 |  2. |   *FreeBSD | 12 years, 2 months, 24 days |
 |  3. |   *OpenBSD |   8 years, 2 months, 7 days |
 |  4. |    *Darwin |  5 years, 1 months, 19 days |