resolved conflict

chuanxshi · Sep 3, 2013 · 0c0948d · 0c0948d
2 parents e42046a + 8d5dfdc
commit 0c0948d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/general-patterns/function-declarations.html b/general-patterns/function-declarations.html
@@ -33,6 +33,7 @@
 			var getData = function getDataFn () {
 			};
 
+
 			// References
 			// http://ejohn.org/blog/javascript-as-a-first-language/
 			// http://kangax.github.com/nfe/