Skip to content
Browse files

fixing breaks

  • Loading branch information...
2 parents 71b5dfc + 6cf9d3d commit 84a567e009fa9b5290decb725e48c8c5c5d5dfcd @mhenke committed
Showing with 1 addition and 0 deletions.
  1. +1 −0 cfml100mins.markdown
View
1 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.

0 comments on commit 84a567e

Please sign in to comment.
Something went wrong with that request. Please try again.