Skip to content
This repository
Browse code

fixing breaks

  • Loading branch information...
commit 400b01c8e60d0c2cd44a47ed0d0e45a149854aba 1 parent 84a567e
Mike Henke authored July 03, 2011

Showing 1 changed file with 0 additions and 1 deletion. Show diff stats Hide diff stats

  1. 1  cfml100mins.markdown
1  cfml100mins.markdown
Source Rendered
... ...
@@ -1,4 +1,3 @@
1  
-<<<<<<< HEAD
2 1
 # CFML in 100 minutes
3 2
 
4 3
 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 notes on commit 400b01c

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