resolved merge conflict

Author: chuanxshi

general-patterns/function-declarations.html

@@ -39,7 +39,7 @@
 
 // named function expression + 'F'
 /* Benefits:
- * 1. Get's rid of (anonymous function) in stack traces
+ * 1. Gets 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(){