antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
Michael RICOIS 2018-01-19 11:23:42 +01:00
parent f010de6d2d
commit 8e2a1ba4a3
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
themes/site_mobile/css/style.css
View File

@ -5363,9 +5363,6 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{
position: absolute;
bottom: 12px;
border-radius: 20px;
<<<<<<< HEAD
right: 0;
=======
>>>>>>> branch 'ticket-14904-achatexpressmobile' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git
z-index: 10000;
}