Created
April 30, 2010 17:59
-
-
Save tedserbinski/385558 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <<<<<<< HEAD:html/sites/mothersclick.com/themes/mothersclick/preprocess/preprocess-node.inc | |
| if ($vars['field_ref1'][0]['view']) { | |
| $vars['entry_first'] = $vars['field_ref1'][0]['view']; | |
| } | |
| if ($vars['field_ref2'][0]['view']) { | |
| $vars['entry_second'] = $vars['field_ref2'][0]['view']; | |
| } | |
| ======= | |
| /** | |
| * Share posts | |
| */ | |
| if (function_exists('_share_posts')) { | |
| $vars['share_post'] = _share_posts($vars['node']); | |
| } | |
| >>>>>>> origin/dev:html/sites/mothersclick.com/themes/mothersclick/preprocess/preprocess-node.inc |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment