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.
This commit is contained in:
20xd6 2020-09-27 16:37:52 -04:00
parent 06289a5137
commit 05a1f50ce0

View File

@ -109,14 +109,13 @@
<br/> <br/>
<label for="originalTZ">Display original timezone</label> <label for="originalTZ">Display original timezone</label>
<input type="checkbox" name="originalTZ" value="origTZ"> <input type="checkbox" name="originalTZ" value="origTZ">
<span class="chkbox> <span class="chkbox">
<label for="displayOffset">Display offset of selected timezones</label> <label for="displayOffset">Display offset of selected timezones</label>
<input type="checkbox" name="displayOffset" value="disOS"/> <input type="checkbox" name="displayOffset" value="disOS"/>
</span> </span>
</form> </form>
<p id="JStz"><?php echo date("e");?></p> <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--> </div><!--end of "body" div-->
</body> </body>
</html> </html>