From 511184a26701103b3278c1e7ac31c89e13264a86 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Thu, 25 Oct 2012 15:27:25 -0400
Subject: [PATCH] fix merge problem

---
 app/assets/javascripts/cocoon.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/cocoon.js b/app/assets/javascripts/cocoon.js
index 509a2ca..2cedf00 100644
--- a/app/assets/javascripts/cocoon.js
+++ b/app/assets/javascripts/cocoon.js
@@ -44,7 +44,7 @@
 
     var contentNode = $(new_content);
 
-    insertionNode.trigger('cocoon:before-insert', contentNode);
+    insertionNode.trigger('cocoon:before-insert', [contentNode]);
 
     // allow any of the jquery dom manipulation methods (after, before, append, prepend, etc)
     // to be called on the node.  allows the insertion node to be the parent of the inserted
@@ -67,7 +67,8 @@
 
     var timeout = trigger_node.data('remove-timeout') || 0;
 
-    setTimeout(function() {
+    setTimeout(
+      function() {
       if ($this.hasClass('dynamic')) {
           $this.closest(".nested-fields").remove();
       } else {