projects
/
WP-Themes
/
GovernmentEmmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a32d979
6e88aba
)
Merge branch 'feature/PopoutInfo' into develop
author
Laury GvR
<laury@gaslightmedia.com>
Thu, 20 Aug 2015 16:25:24 +0000
(12:25 -0400)
committer
Laury GvR
<laury@gaslightmedia.com>
Thu, 20 Aug 2015 16:25:24 +0000
(12:25 -0400)
Conflicts:
page.php
1
2
page.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
page.php
index
9f3813e
,
3eaf99d
..
f6a3bdd
---
1
/
page.php
---
2
/
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">