Merge branch 'dev' of https://dev.quiqqer.com/quiqqer/order into dev

dcc013d3 · Henning Leutz · c23f7bae · cbbf03fd · dcc013d3
Commit dcc013d3 erstellt 5 years ago von Henning Leutz
--- a/src/QUI/ERP/Order/Controls/OrderProcess.css
+++ b/src/QUI/ERP/Order/Controls/OrderProcess.css
@@ -185,15 +185,15 @@
    width: 100%;
 }

-<<<<<<< HEAD
+
 .quiqqer-fu-login-container,
 .quiqqer-order-ordering-nobody-registration {
    margin-left: 1rem;
    margin-right: 1rem;
-=======
+}
+
 .quiqqer-order-ordering-nobody h2 {
    text-align: center;
->>>>>>> de4653eb6275ddfe5c514a1c858d2c9948f3f098
 }

 .quiqqer-order-ordering-nobody form {