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

[John Carlson]

$ 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


Sent from Mail for Windows 10

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://web3d.org/pipermail/x3d-public_web3d.org/attachments/20190120/6742a672/attachment-0001.html>