resolved merge conflict

Author: chuanxshi

general-patterns/function-declarations.html

@@ -30,7 +30,6 @@
 // named function expression
 /* Benefits:
  * 1. Provides the debugger with an explicit function name: helps stack inspection.
- * 2. Allows recursive functions: getData can call itself.
  * Issues:
  * 3. Can break IE, coffeescript doesn't do function names:
  * https://github.com/jashkenas/coffee-script/issues/366
@@ -40,9 +39,8 @@
 
 // named function expression + 'F'
 /* Benefits:
- * 1. Gets rid of (anonymous function) in stack traces
- * 2. Recurse by calling the name + 'F'
- * 3. Doesn't break an IE (well, unless there's a function name collision of the sort described here: https://github.com/jashkenas/coffee-script/issues/366#issuecomment-242134)
+ * 1. Get's rid of (anonymous function) in stack traces
+ * 2. Doesn't break an IE (well, unless there's a function name collision of the sort described here: https://github.com/jashkenas/coffee-script/issues/366#issuecomment-242134)
  */
 vargetData=functiongetDataF(){
 };