[x3d-public] Error in 19777-3, 19777-4 V3.3, several files diff checked-in wrong properly

[Brutzman, Donald (Don) (CIV)]

Thanks for this report John.  That is a work in progress.  We certainly don't want broken checkins or failing diffs!

We expect to hear more from Dr. Myeong Won Lee in the last session later today.  Any slides will be posted online.

==============================================
Web3D Korea Chapter and ISO/IEC JTC 1/SC24 WG9
http://www.web3d.org/event/web3d-korea-chapter-and-isoiec-jtc-1sc24-wg9

27.  16:00-16:30  X3D C/C++ language binding, Myeong Won Lee (Suwon U.)
28.  16:30-17:00  X3D C# language binding, Myeong Won Lee (Suwon U.)
==============================================

On 1/21/2019 1:20 PM, John Carlson wrote:
> $ find . -type f -print0| xargs -0 grep -n "<<<<"
> 
> ./ISO-IEC 19777/ISO-IEC 19777-3/ISO-IEC 19777-3 V3.3/ISO-IEC 19777-3 V3.3 CD/Par
> 
> t03/foreword.html:1:<<<<<<< HEAD
> 
> ./ISO-IEC 19777/ISO-IEC 19777-4/ISO-IEC 19777-4 V3.3/ISO-IEC 19777-4 V3.3 CD/Par
> 
> t04/concepts.html:473:<<<<<<< HEAD
> 
> ./ISO-IEC 19777/ISO-IEC 19777-4/ISO-IEC 19777-4 V3.3/ISO-IEC 19777-4 V3.3 CD/Par
> 
> t04/foreword.html:1:<<<<<<< HEAD
> 
> ./ISO-IEC 19777/ISO-IEC 19777-4/ISO-IEC 19777-4 V3.3/ISO-IEC 19777-4 V3.3 CD/Par
> 
> t04/functions.html:1:<<<<<<< HEAD
> 
> ./ISO-IEC 19777/ISO-IEC 19777-4/ISO-IEC 19777-4 V3.3/ISO-IEC 19777-4 V3.3 CD/Par
> 
> t04/tables.html:1:<<<<<<< HEAD
> 
> ./ISO-IEC 19777/ISO-IEC 19777-4/ISO-IEC 19777-4 V3.3/ISO-IEC 19777-4 V3.3 CD/Par
> 
> t04/types.html:6:<<<<<<< HEAD
> 
> ./ISO-IEC 19777/ISO-IEC 19777-4/ISO-IEC 19777-4 V3.3/ISO-IEC 19777-4 V3.3 CD/Par
> 
> t04/types.html:16:<<<<<<< HEAD
> 
> ./ISO-IEC 19777/ISO-IEC 19777-4/ISO-IEC 19777-4 V3.3/ISO-IEC 19777-4 V3.3 CD/Par
> 
> t04/types.html:28:<<<<<<< HEAD
> 
> ./ISO-IEC 19777/ISO-IEC 19777-4/ISO-IEC 19777-4 V3.3/ISO-IEC 19777-4 V3.3 CD/Par
> 
> t04/types.html:1098:<<<<<<< HEAD
> 
> John Carlson

all the best, Don
-- 
Don Brutzman  Naval Postgraduate School, Code USW/Br       brutzman at nps.edu
Watkins 270,  MOVES Institute, Monterey CA 93943-5000 USA   +1.831.656.2149
X3D graphics, virtual worlds, navy robotics http://faculty.nps.edu/brutzman