Merge error local branch

Pascal Dreissen · Pascal Dreissen · commit bdfd7571acc4 · 2016-08-16T09:57:41.000+02:00
diff --git a/interface/web/themes/default/assets/stylesheets/ispconfig.css b/interface/web/themes/default/assets/stylesheets/ispconfig.css
@@ -722,7 +722,6 @@ input[type="password"].form-control[readonly] {
 }
 .tooltip-inner {
     max-width: 100%;
-<<<<<<< HEAD
 }
 .notification {
     width: 35px;
@@ -760,6 +759,4 @@ span.notification_text {
     margin-bottom: auto;
     font-family: inherit;
     color: white;
-=======
->>>>>>> 89391e179a7677045efd1f15df091696b5f55e7e
 }

Original file line number	Diff line number	Diff line change
`@@ -722,7 +722,6 @@ input[type="password"].form-control[readonly] {`
`722`	`722`	`}`
`723`	`723`	`.tooltip-inner {`
`724`	`724`	`max-width: 100%;`
`725`		`-<<<<<<< HEAD`
`726`	`725`	`}`
`727`	`726`	`.notification {`
`728`	`727`	`width: 35px;`
`@@ -760,6 +759,4 @@ span.notification_text {`
`760`	`759`	`margin-bottom: auto;`
`761`	`760`	`font-family: inherit;`
`762`	`761`	`color: white;`
`763`		`-=======`
`764`		`->>>>>>> 89391e179a7677045efd1f15df091696b5f55e7e`
`765`	`762`	`}`