From 89dedab8ba86fdc7b4845dde05fb48a31afa25ea Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Tue, 13 Jun 2017 01:12:51 -0500
Subject: [PATCH] resolved henry latest conflicts

---
 .../datacenterlight/css/landing-page.css      | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css
index c6b734d1..3e0e6121 100755
--- a/datacenterlight/static/datacenterlight/css/landing-page.css
+++ b/datacenterlight/static/datacenterlight/css/landing-page.css
@@ -595,16 +595,9 @@ h6 {
    width: 50%;
 }
 .price-calc-section .text .section-heading{
-<<<<<<< HEAD
-    font-family: 'Lato-Black';
     font-size: 48px;
     line-height: 48px;
-=======
-    font-family: 'Montserrat-Bold';
-    font-size: 50px;
-    line-height: 50px;
->>>>>>> master
-    padding-bottom: 25px;
+    padding-bottom: 27px;
     color: #3a3a3a;
     letter-spacing: 1px;
     position: relative;
@@ -671,11 +664,7 @@ h6 {
 }
 
 .price-calc-section .card .description span {
-<<<<<<< HEAD
-    font-size: 18px;
-=======
     font-size: 16px;
->>>>>>> master
     margin-left: 4px;
     margin-left: 0px;
     /* justify-self: start; */
@@ -728,11 +717,7 @@ h6 {
 .price-calc-section .card .description.input label{
     font-size: 15px;
     font-weight: 800;
-<<<<<<< HEAD
     font-family: 'Lato-Regular';
-=======
-    font-family: 'Montserrat-Regular';
->>>>>>> master
     margin-bottom: 0;
     width: 40px;
 }
@@ -746,10 +731,7 @@ h6 {
     background: #fff;
     margin-left: 10px;
 }
-<<<<<<< HEAD
 
-=======
->>>>>>> master
 .price-calc-section .card .check-ip input[type=checkbox]{
     font-size: 17px;
     margin: 0 8px;