fixing breaks

mhenke · Jul 3, 2011 · 84a567e · 84a567e
2 parents 71b5dfc + 6cf9d3d
commit 84a567e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/cfml100mins.markdown b/cfml100mins.markdown
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # CFML in 100 minutes
 
 ColdFusion Markup Language (CFML) is a great programming language for beginners because it was written to make the programmer's job easy and not care if the computer's job is hard. In this brief introduction we'll look at key language features you need to get started.