From 86bfdfb4e4fc5e424f4eb608642a7973d93c3992 Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Sun, 16 Jun 2019 02:28:34 +0000
Subject: Fix merge conflict in tk.tcl from services branch merge

---
 library/tk.tcl | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/tk.tcl b/library/tk.tcl
index 28e9aad..a055e7d 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -676,7 +676,7 @@ proc ::tk::mcmaxamp {args} {
     return $maxlen
 }
 
-# For now, turn off the custom mdef proc for the mac:
+# For now, turn off the custom mdef proc for the Mac:
 
 if {[tk windowingsystem] eq "aqua"} {
     namespace eval ::tk::mac {
@@ -691,7 +691,6 @@ proc ::tk::RegisterServiceWidget {w} {
   }
 }
 
-
 # Run the Ttk themed widget set initialization
 if {$::ttk::library ne ""} {
     uplevel \#0 [list source $::ttk::library/ttk.tcl]
-- 
cgit v0.12