合并冲突代码

src/Add-on/DrawLine.ts

@@ -210,12 +210,7 @@ export class DrawTest implements Command
 
             obj.position.set(Math.random() * 1000, Math.random() * 1000, Math.random() * 1000, );
 
-<<<<<<< HEAD
-            app.m_Database.appendEntity(box);
-
-=======
             // app.m_Database.appendEntity(box);
->>>>>>> master
             app.m_Viewer.m_Scene.add(obj);
         }
     }