fix conflicts

This commit is contained in:
yogesh_gohil
2019-11-14 15:51:48 +05:30
parent 4839e57791
commit 2dda0baa3f
51 changed files with 576 additions and 226 deletions

View File

@ -182,6 +182,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 160px;
}
.ship-user-phone {
font-style: normal;
@ -229,6 +230,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 160px;
}
.bill-user-phone {

View File

@ -142,6 +142,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 170px;
}
.bill-user-phone {
font-style: normal;
@ -190,6 +191,7 @@
color: #595959;
padding: 0px;
margin: 0px;
width: 170px;
}
.ship-user-phone {

View File

@ -146,6 +146,7 @@
line-height: 15px;
color: #595959;
margin: 0px;
width: 160px;
}
.ship-user-phone {
@ -184,6 +185,7 @@
line-height: 15px;
color: #595959;
margin: 0px;
width: 160px;
}
.bill-user-phone {