summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilson Page <wilsonpage@me.com>2013-10-15 21:54:53 +0100
committerWilson Page <wilsonpage@me.com>2013-10-15 21:54:53 +0100
commit28f546282bdd586de047dd12213db4b0545a6bc7 (patch)
tree75736d0ec78b035edde53e42ffdd592a48d374e5
parentcdc7afce1c2987a52d2eee70e41510f55bb48955 (diff)
parent7d1972179142f1aa69ddf29abbfb7e814e37d463 (diff)
downloadfastdom-28f546282bdd586de047dd12213db4b0545a6bc7.zip
fastdom-28f546282bdd586de047dd12213db4b0545a6bc7.tar.gz
fastdom-28f546282bdd586de047dd12213db4b0545a6bc7.tar.bz2
Fix merge conflict
-rw-r--r--History.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/History.md b/History.md
index 30a09b4..ecc6066 100644
--- a/History.md
+++ b/History.md
@@ -12,7 +12,7 @@
0.8.0 / 2013-10-14
==================
- * change - to a rAF loop technique of emtying frame queue to prevent frame conflicts
+ * change - to a rAF loop technique of emptying frame queue to prevent frame conflicts
* add - ability to call `FastDom#defer` with no frame argument to schedule job for next free frame
* change - errors not caught by default