fix conflict

This commit is contained in:
Mohit Panjwani
2019-11-12 18:41:25 +05:30
40 changed files with 2102 additions and 377 deletions
+6
View File
@@ -18173,6 +18173,7 @@ fieldset[disabled] .multiselect {
.reports .report-view-button {
display: none;
color: #fff;
}
.reports .report-fields-container {
@@ -18208,8 +18209,13 @@ fieldset[disabled] .multiselect {
display: none;
}
.reports .report-submit-button-container {
display: none;
}
.reports .report-view-button {
display: flex;
color: #fff !important;
justify-content: center;
}
File diff suppressed because one or more lines are too long
+1270 -186
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long