Skip to content
Browse files

Initial

  • Loading branch information...
2 parents 9ba5c5a + 7a208c9 commit 40c9bf7675fb84e78d9a011052b9d0900ec7dde1 @nl5887 nl5887 committed
Showing with 26 additions and 0 deletions.
  1. +21 −0 LICENSE
  2. +5 −0 README.md
View
21 LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 DutchCoders [https://github.com/dutchcoders/]
+
+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 the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
View
5 README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
# transfer.sh
@@ -6,3 +7,7 @@ Development
- grunt serve
- grunt build
+=======
+transfer.sh
+===========
+>>>>>>> 7a208c9efbfc3f0a063bff4edf43fbbf76e1371f

0 comments on commit 40c9bf7

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