[Tcl-bugs] [tk-commits] - dkf (branch: trunk) - Remove accidental commit of merge conflict, resolved to original code.

[tk-commits <tcl...@tc...>]

Commit by dkf (branch: trunk):

Remove accidental commit of merge conflict, resolved to original code.

http://core.tcl.tk/tk/info/538be101355591aabb1854d009fa1d38519145ac

Changeset:

	win/buildall.vc.bat