Skip to content

Commit

Permalink
fixing breaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@mhenke
mhenke committed Jul 3, 2011
1 parent 84a567e commit 400b01c
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion cfml100mins.markdown
View file
@@ -1,4 +1,3 @@
<<<<<<< HEAD
# CFML in 100 minutes # 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. 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.
Expand Down

0 comments on commit 400b01c

Please sign in to comment.