From a7948f0e509adc651078cab2997dbec3f2407c73 Mon Sep 17 00:00:00 2001 From: Eli JacobX Ramirez Cervantes Date: Thu, 2 Feb 2017 12:14:43 -0600 Subject: [PATCH] Conflicts were resolved --- source/_themes/clearlinux/static/css/overrides.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/_themes/clearlinux/static/css/overrides.css b/source/_themes/clearlinux/static/css/overrides.css index de8d444d..975c359b 100755 --- a/source/_themes/clearlinux/static/css/overrides.css +++ b/source/_themes/clearlinux/static/css/overrides.css @@ -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