Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 21:34:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Julie Lenaerts 2022-06-13 16:35:04 +02:00
commit 83b928b0b0
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
View File

@ -122,11 +122,18 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
<<<<<<< HEAD
=======
>>>>>>> fec27babbe6b902b1de8a1b15ffac49c4e0b02b3
.no-address-yet { .no-address-yet {
text-align: center; text-align: center;
box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px; box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
padding:1.5rem; padding:1.5rem;
<<<<<<< HEAD
=======
margin-left: auto;
>>>>>>> fec27babbe6b902b1de8a1b15ffac49c4e0b02b3
i { i {
font-size:2rem; font-size:2rem;
margin-bottom:2rem; margin-bottom:2rem;