From: Andy Hebrank <ahebrank@gmail.com>
Date: Fri, 4 Nov 2016 12:05:28 +0000 (-0400)
Subject: fix merge conflict
X-Git-Tag: v6.3-rc1~35^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9242%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

fix merge conflict
---

60045b14771cc0d9f32427ddbd7f7a73ec65624f
diff --cc js/foundation.tabs.js
index 256ed2b72,3c369448d..04215c87d
--- a/js/foundation.tabs.js
+++ b/js/foundation.tabs.js
@@@ -241,8 -214,11 +245,11 @@@ class Tabs 
       * @event Tabs#change
       */
      this.$element.trigger('change.zf.tabs', [$target]);
+ 
 -	//fire to children a mutation event
++	  //fire to children a mutation event
+ 	  $targetContent.find("[data-mutate]").trigger("mutateme.zf.trigger");
    }
-   
+ 
    /**
     * Opens the tab `$targetContent` defined by `$target`.
     * @param {jQuery} $target - Tab to Open.