diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2019-05-12 00:45:22 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2019-05-12 00:45:22 (GMT) |
| commit | 0d8e8d2c81cd020a63fa12e6b1d168515a4e3083 (patch) | |
| tree | 0f542d6c89f5fc798284a3b0f359bb980697cdf1 /macosx/tkMacOSXPrivate.h | |
| parent | 072a5b975a1be10db800fc4351679183f6156030 (diff) | |
| download | tk-0d8e8d2c81cd020a63fa12e6b1d168515a4e3083.zip tk-0d8e8d2c81cd020a63fa12e6b1d168515a4e3083.tar.gz tk-0d8e8d2c81cd020a63fa12e6b1d168515a4e3083.tar.bz2 | |
Clean up merge
Diffstat (limited to 'macosx/tkMacOSXPrivate.h')
| -rw-r--r-- | macosx/tkMacOSXPrivate.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h index d92b135..3e3183c 100644 --- a/macosx/tkMacOSXPrivate.h +++ b/macosx/tkMacOSXPrivate.h @@ -1,4 +1,3 @@ -<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<< /* * tkMacOSXPrivate.h -- * |