|
|
@@ -39,13 +39,7 @@
|
|
|
<div class="content">
|
|
|
<div class="container-fluid">
|
|
|
<div class="row">
|
|
|
- <div class="main-content col-lg-7 p-0">
|
|
|
-<<<<<<< HEAD
|
|
|
- 11
|
|
|
- </div>
|
|
|
- <div class="main-side col-lg-5 p-0">
|
|
|
- 22
|
|
|
-=======
|
|
|
+ <div class="main-side col-lg-7 p-0">
|
|
|
<table class="table table-bordered">
|
|
|
<thead>
|
|
|
<tr>
|
|
|
@@ -255,7 +249,6 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
->>>>>>> c82e0cae4a083e912151caafcd3118a41cf1b284
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
