cleaning up messy merge

cardinalcss · Jan 17, 2014 · 1123892 · 1123892
1 parent a856c4f
commit 1123892
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,11 +1,6 @@
-<<<<<<< HEAD:LICENSE.md
 Copyright (c) Chris Bracco
-=======
-Copyright © Chris Bracco
-http://cardinalcss.com
 
 MIT License
->>>>>>> 11343721eba6a002bd7b3fbd50fd6f6b5562acad:LICENSE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in