diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-09 12:05:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-09 12:05:51 (GMT) |
| commit | cbaffee229fcb25874c1a203cce2c365bfd7626e (patch) | |
| tree | a7b9084bf7c0665d95b6dd72f7b97d73502bbdc7 /macosx/tkMacOSXInit.c | |
| parent | c618e62f1db83082ee6c40220b915383fb209821 (diff) | |
| download | tk-cbaffee229fcb25874c1a203cce2c365bfd7626e.zip tk-cbaffee229fcb25874c1a203cce2c365bfd7626e.tar.gz tk-cbaffee229fcb25874c1a203cce2c365bfd7626e.tar.bz2 | |
Fix merge conflict in previous commit (::tk::mac::registerServiceWidget called twice as result)
Diffstat (limited to 'macosx/tkMacOSXInit.c')
| -rw-r--r-- | macosx/tkMacOSXInit.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index 87c4d51..92b6578 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -430,8 +430,6 @@ TkpInit( TkMacOSXIconBitmapObjCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "::tk::mac::GetAppPath", TkMacOSXGetAppPathCmd, NULL, NULL); - Tcl_CreateObjCommand(interp, "::tk::mac::registerServiceWidget", - TkMacOSXRegisterServiceWidgetObjCmd, NULL, NULL); Tcl_CreateObjCommand(interp, "::tk::mac::registerServiceWidget", TkMacOSXRegisterServiceWidgetObjCmd, NULL, NULL); |