Permalink
Browse files

fixing breaks

  • Loading branch information...
1 parent 84a567e commit 400b01c8e60d0c2cd44a47ed0d0e45a149854aba @mhenke committed Jul 3, 2011
Showing with 0 additions and 1 deletion.
  1. +0 −1 cfml100mins.markdown
View
@@ -1,4 +1,3 @@
-<<<<<<< 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.

0 comments on commit 400b01c

Please sign in to comment.