From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 20 Aug 2015 16:25:24 +0000 (-0400)
Subject: Merge branch 'feature/PopoutInfo' into develop
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=9b77fddc66e13eae928899cbcb01f2f75808c9b4;p=WP-Themes%2Fglmthemes%2Fcrawfordcounty-theme.git

Merge branch 'feature/PopoutInfo' into develop

Conflicts:
	page.php
---

9b77fddc66e13eae928899cbcb01f2f75808c9b4
diff --cc page.php
index 9f3813e,3eaf99d..f6a3bdd
--- a/page.php
+++ b/page.php
@@@ -1,14 -1,7 +1,7 @@@
  <?php get_header(); ?>
                  <main>
                      <div class="row" data-equalizer>
 -                        <?php get_sidebar(); ?>
 +                    <?php get_sidebar();?>
-                         <?php if (get_the_block( 'sidebar' ) != ""
-                             && empty($ninja_forms_append_page_form_id)
-                             && $name != "request-brochures"
-                             && $name != "contact-us"
-                             && $name != "tips-hotline") { ?>
-                         <?php } ?>
-                         
                          <div id="content-bulk" class="small-12 large-9 columns" data-equalizer-watch>
                              <div id="con" class="row">
                                  <div class="small-12 columns">