Resolved merge conflict.

[com.zyxware.civiwci.git] / extern / wciwidget.php

diff --git a/extern/wciwidget.php b/extern/wciwidget.php
index bf5500e6d669e7128c828facb71d0d0cfd3259d4..d86822833e02cf746681ff693f8915773d7b0b88 100644 (file)
--- a/extern/wciwidget.php
+++ b/extern/wciwidget.php
@@ -51,11 +51,6 @@ $embed = CRM_Utils_Request::retrieve('embed', 'Positive', CRM_Core_DAO::$_nullOb
 
 if (isset($format)) {
   $jsonvar .= $cpageId;
-}
-
-$data = "";
-if (isset($embed) && (true == $embed)) {
-
 } else {
   $data = CRM_Wci_BAO_Widget::getWidgetData($widgetId);