pjpatil12/Comparison_Project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved merge conflicts

Browse Source
This commit is contained in:
Pankaj J Patil
2026-02-28 16:59:24 +05:30
parent 8353bb6426 1dceb640bd
commit bb56f00a6c
2 changed files with 66 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/templates/client_report.html
View File

@@ -29,20 +29,25 @@
<ul class="nav nav-tabs" id="reportTabs" role="tablist">
<li class="nav-item">
<button class="nav-link active" id="tr-tab" data-bs-toggle="tab" data-bs-target="#tr"
type="button">Tr.Ex Comparison</button>
type="button">Tr.Ex </button>
</li>
<li class="nav-item">
<button class="nav-link" id="mh-tab" data-bs-toggle="tab" data-bs-target="#mh" type="button">Mh.Ex
Comparison</button>
</button>
</li>
<li class="nav-item">
<button class="nav-link" id="dc-tab" data-bs-toggle="tab" data-bs-target="#dc" type="button">MH & DC
Comparison</button>
</button>
</li>
<li class="nav-item">
<<<<<<< HEAD
<button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying"
type="button">Laying
& Bedding Comparison</button>
=======
<button class="nav-link" id="laying-tab" data-bs-toggle="tab" data-bs-target="#laying" type="button">Laying
& Bedding </button>
>>>>>>> 1dceb640bd930c37888799f10f02fe90b219be67
</ul>
<div class="tab-content mt-3" id="reportTabsContent">