merge conflict behoben

2013-08-11 10:50:33 +02:00
parent 88ba8fa1c2
commit fd4cd17b53
4 changed files with 16 additions and 139 deletions
--- a/app/assets/stylesheets/formtastic-changes.css.scss
+++ b/app/assets/stylesheets/formtastic-changes.css.scss
@@ -6,22 +6,8 @@ width:90%;
 height:20em;
 }

-<<<<<<< HEAD
 form.formtastic .input label.control-label {
 font-weight:bold;
 font-size:125%;
 }
-=======

-div.form-group {
-border-width: 1px;
-border-style: none;
-padding: 10px;
-// border-radius: 10px;
-}
-div.verwalten-block {
-border-width: 1px;
-border-style: solid;
-padding: 5px;
-}
->>>>>>> a5a02e065a319d162c5a280605c2c0d3c15643ca