修正冲突

zaojiashu.html

@@ -36,32 +36,11 @@
                 <span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="单项工程名称"><i class="fa fa-cube"></i>...</span>
                 <span><i class="fa fa-sticky-note-o"></i></span>
                 <span class="text-truncate"  data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程">&nbsp;乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程</span>
-<<<<<<< HEAD
                 <!--别人分享给我-->
                 <span class="alert alert-success py-0 px-2 m-0" id="share-info"><i class="fa fa-share-alt"></i>来自 张三 的分享（可拷贝 可编辑）</span>
                 <!--我创建的标段-->
                 <span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="已分享给张三 王五等5人"><a href="" class="btn btn-xs btn-primary" ><i class="fa fa-share-alt"></i> 分享</a></span>
-                <!-- <span class="alert alert-success py-0 px-2 m-0" id="share-info"><i class="fa fa-share-alt"></i> 已与其他用户协作</span>
-                    <ul class="f-nav list-unstyled">
-=======
-                <span><a class="mr-3" href="#" ><i class="fa fa-share-alt" aria-hidden="true"></i> 分享</a></span>
-                <!-- <span class="alert alert-success py-0 px-2 m-0" id="share-info" title="张三 分享（只读，协作）"><i class="fa fa-share-alt"></i> 张三 分享（只读，协作）</span> -->
-                <!-- <span class="alert alert-success py-0 px-2 m-0" id="share-info"><i class="fa fa-share-alt"></i> 已分享给其他用户</span> -->
-                <!-- <span class="alert alert-success py-0 px-2 m-0" id="share-info"><i class="fa fa-share-alt"></i> 已与其他用户协作</span> -->
-                    <!-- <ul class="f-nav list-unstyled">
->>>>>>> 3705592efb89dc1c3fe0ad508523a2c93d64099a
-                        <li class="d-flex justify-content-between focus"><span class="title text-truncate"><i class="fa fa-cube"></i> 单项工程1</span><i class="fa fa-caret-right text-muted mt-1"></i>
-                            <ul class="s-nav list-unstyled">
-                                <li class="d-flex"><a href="#"><span class="title text-truncate"><i class="fa fa-sticky-note-o"></i> 土建1</span></a></li>
-                                <li class="d-flex"><a href="#"><span class="title text-truncate"><i class="fa fa-sticky-note-o"></i> 土建2</span></a></li>
-                                <li class="d-flex"><a href="#"><span class="title text-truncate"><i class="fa fa-sticky-note-o"></i> 土建3</span></a></li>
-                            </ul>
-                        </li>
-                        <li class="d-flex justify-content-between"><span class="title text-truncate"><i class="fa fa-cube"></i> 单项工程2</span></li>
-                        <li class="d-flex justify-content-between"><span class="title text-truncate"><i class="fa fa-cube"></i> 单项工程3</span><i class="fa fa-angle-right text-muted mt-1"></i></li>
-                        <li class="d-flex justify-content-between"><span class="title text-truncate"><i class="fa fa-cube"></i> 单项工程4</span><i class="fa fa-angle-right text-muted mt-1"></i></li>
-                        <li class="d-flex justify-content-between"><span class="title text-truncate"><i class="fa fa-cube"></i> 单项工程5</span></li>
-                    </ul>-->
+
                 </div>
                 <div class="navbar-text p-0 navbar-expand-sm">
                     <!--大屏菜单-->