From 05a1f50ce012b2b3d34d854d1ec5908b660e8996 Mon Sep 17 00:00:00 2001
From: 20xd6 <20xd6@airmail.cc>
Date: Sun, 27 Sep 2020 16:37:52 -0400
Subject: [PATCH 1/2] Rebase master as true master.

I had started a new feature on master. This is not how it should be done
and I am now atoning for my mistakes.
---
 clock.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/clock.php b/clock.php
index f1552b4..6ae0eb7 100644
--- a/clock.php
+++ b/clock.php
@@ -109,14 +109,13 @@
         <br/>
         <label for="originalTZ">Display original timezone</label>
         <input type="checkbox" name="originalTZ" value="origTZ">
-        <span class="chkbox>
+        <span class="chkbox">
           <label for="displayOffset">Display offset of selected timezones</label>
           <input type="checkbox" name="displayOffset" value="disOS"/>
         </span>
       </form>
       <p id="JStz"><?php echo date("e");?></p>
-      <h3>Timer</h3>
-      <a href="timer/" title="The timer page">Timer</a>
+      
     </div><!--end of "body" div-->
   </body>
 </html>

From 7e3cf8ccd673646f6dbc349bca975c318cda2632 Mon Sep 17 00:00:00 2001
From: 20xd6 <20xd6@airmail.cc>
Date: Sun, 27 Sep 2020 16:58:10 -0400
Subject: [PATCH 2/2] Fix https://efrick.ddns.net/git/20xd6/WebClock/issues/1

This should reslove the issue with the time not updating.
It appears that an issue with conflicting options for the time
formatting has been introduced.
---
 clock.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/clock.js b/clock.js
index 98cc7eb..875acf5 100644
--- a/clock.js
+++ b/clock.js
@@ -18,14 +18,12 @@ function startTime(){
                 + current_time.toLocaleString('en-US', 
                 {timeZone: current_tz,
                 hourCycle:'h24',
-                timeStyle:'long',
                 hour: '2-digit',
                 minute:'2-digit',
                 second:'2-digit',
                 timeZoneName:'short'});
   document.getElementById('time_body').innerHTML = current_time.toLocaleString('en-EN' ,{
                                          timeZone: current_tz,
-                                         dateStyle:'long',
                                          hourCycle:'h24',
                                          weekday:'short',
                                          month:'short',
@@ -37,7 +35,6 @@ function startTime(){
   if(original_tz){//Test if there is a non-null value for original_tz. If True then the part of the page this pertains to is being displayed.
     document.getElementById('time_original').innerHTML = current_time.toLocaleString('en-EN' ,{
                                            timeZone: original_tz,
-                                           dateStyle:'long',
                                            hourCycle:'h24',
                                            weekday:'short',
                                            month:'short',