Merge branch 'feature/PopoutInfo' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 20 Aug 2015 16:25:24 +0000 (12:25 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 20 Aug 2015 16:25:24 +0000 (12:25 -0400)
Conflicts:
page.php

1  2 
page.php

diff --cc 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">