From 00149457779b8ff35689a2f49ad837a4ba63a01e Mon Sep 17 00:00:00 2001
From: Conduitry <git@fur.army>
Date: Sun, 26 Mar 2017 15:10:27 -0400
Subject: [PATCH] fix merge

---
 src/generators/dom/visitors/attributes/addComponentBinding.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/generators/dom/visitors/attributes/addComponentBinding.js b/src/generators/dom/visitors/attributes/addComponentBinding.js
index 82bb4fc5a8..df9efbc681 100644
--- a/src/generators/dom/visitors/attributes/addComponentBinding.js
+++ b/src/generators/dom/visitors/attributes/addComponentBinding.js
@@ -59,7 +59,7 @@ export default function createBinding ( generator, node, attribute, current, loc
 		if ( !${updating} && ${dependencies.map( dependency => `'${dependency}' in changed` ).join( '||' )} ) {
 			${updating} = true;
 			${local.name}._set({ ${attribute.name}: ${snippet} });
-			${local.name}_updating = false;
+			${updating} = false;
 		}
 	` );
 }