fixed merge conflicts

css/style.css

@@ -422,11 +422,7 @@ ul#nav li a:hover .ul#nav li ul {
    height: 80px;
    width: 250px;
    position: absolute;
-<<<<<<< HEAD
    top: 20px;
-=======
-   top: -20px;
->>>>>>> master
 }
 .service-logo img {
    height: 80px;
@@ -438,15 +434,9 @@ ul#nav li a:hover .ul#nav li ul {
    display: inline-block;
    text-align: center;
    vertical-align: top;
-<<<<<<< HEAD
    height: 240px;
    width: 250px;
    margin: 70px 25px;
-=======
-   height: 300px;
-   width: 250px;
-   margin: 30px 25px;
->>>>>>> master
    padding-top: 30px;
    clear: none;
    border-radius: 0px;
@@ -457,7 +447,6 @@ ul#nav li a:hover .ul#nav li ul {
 .framed p {
    width: 80%;
    text-align: left;
-<<<<<<< HEAD
    color: #555;
    margin: 5px auto;
    height: 58%;
@@ -466,9 +455,6 @@ ul#nav li a:hover .ul#nav li ul {
 .framed h2 {
    width: 70%;
    text-align: center;
-=======
-   width: 60%;
->>>>>>> master
    margin: 5px auto;
    font-size: 1.5em;
 }

templates/modular/services.html.twig

@@ -7,11 +7,8 @@
              {% for item in page.header.services %}
                <div class="four columns">
                    <div class="framed">
-<<<<<<< HEAD
                    <div class="service-logo"> <img src="../user/themes/disroot/images/logo_{{ item.icon }}"></div>
-=======
-                   <div class="service-logo"> <img src="user/themes/disroot/images/logo_{{ item.icon }}"></div>
->>>>>>> master
+
                            <a href="{{ item.link }}">
                            <h2>{{ item.title }}</h2>
                            <p class="service">