summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Boyer2010-09-07 20:12:52 (GMT)
committer Sam Boyer2010-09-07 20:12:52 (GMT)
commit64a09c462a76e9c0626744ba98286b8a71f88761 (patch)
tree406401ebb48444fee93d332a34dc48737480db21
parentaeed3fefe9a089b7b38824389559f9d3e38a94d2 (diff)
Removing some merge remnants.
-rw-r--r--includes/context.inc18
-rw-r--r--js/ajax-responder.js1
-rw-r--r--plugins/content_types/search/search_result.inc3
3 files changed, 0 insertions, 22 deletions
diff --git a/includes/context.inc b/includes/context.inc
index 76c1cef..fe3edac 100644
--- a/includes/context.inc
+++ b/includes/context.inc
@@ -611,23 +611,6 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts) {
// Figure out our keyword and converter, if specified.
if (strpos($keyword, ':')) {
list($context, $converter) = explode(':', $keyword);
-<<<<<<< HEAD
- if (empty($context->empty) && isset($context_keywords[$context])) {
- $keywords['%' . $keyword] = ctools_context_convert_context($context_keywords[$context], $converter);
- }
- else {
- $keywords['%' . $keyword] = '';
- }
- }
- else {
- if (isset($context_keywords[$keyword])) {
- if (empty($context_keywords[$keyword]->empty)) {
- $keywords['%' . $keyword] = $context_keywords[$keyword]->title;
- }
- else {
- $keywords['%' . $keyword] = '';
- }
-=======
}
else {
$context = $keyword;
@@ -636,7 +619,6 @@ function ctools_context_keyword_substitute($string, $keywords, $contexts) {
// Fall back to a default converter, if specified.
if ($plugin && !empty($plugin['convert default'])) {
$converter = $plugin['convert default'];
->>>>>>> DRUPAL-6--1
}
}
diff --git a/js/ajax-responder.js b/js/ajax-responder.js
index 2ae87fa..f427e3d 100644
--- a/js/ajax-responder.js
+++ b/js/ajax-responder.js
@@ -129,7 +129,6 @@
$('.ctools-ajaxing').removeClass('ctools-ajaxing');
return false;
}
->>>>>>> DRUPAL-6--1
return false;
};
diff --git a/plugins/content_types/search/search_result.inc b/plugins/content_types/search/search_result.inc
index 7d8c551..4c83350 100644
--- a/plugins/content_types/search/search_result.inc
+++ b/plugins/content_types/search/search_result.inc
@@ -86,12 +86,9 @@ function ctools_search_result_content_type_render($subtype, $conf, $panel_args,
function ctools_search_result_content_type_edit_form(&$form, &$form_state) {
$conf = $form_state['conf'];
-<<<<<<< HEAD
-=======
// Add js for collapsible fieldsets manually
drupal_add_js('misc/collapse.js');
->>>>>>> DRUPAL-6--1
$types = array();
foreach (module_implements('search') as $name) {
$types[$name] = module_invoke($name, 'search', 'name', TRUE);