solve conflict

This commit is contained in:
hastichavda
2019-11-16 11:40:50 +05:30
42 changed files with 101 additions and 1657 deletions

View File

@ -34,7 +34,7 @@
</v-dropdown>
</div>
</div>
<div class="estimate-si debar">
<div class="estimate-sidebar">
<base-loader v-if="isSearching" />
<div v-else class="side-header">
<base-input