Conflicts were resolved

This commit is contained in:
Eli JacobX Ramirez Cervantes
2017-02-02 12:14:43 -06:00
parent d81f995941
commit a7948f0e50
@@ -182,7 +182,6 @@ footer .menu-name-menu-social-media {
margin-left: 40px;
}
<<<<<<< HEAD
.section-documentation table {
margin: 2em 0;
display: block;
@@ -211,7 +210,7 @@ footer .menu-name-menu-social-media {
width: 100%;
display: block;
}
=======
.project-header .right {
display: block;
float: left;
@@ -267,4 +266,3 @@ header.menu-open .region-header{
display: block
}
}
>>>>>>> Fix mobile menu