Skip to content

Commit d84d62f

Browse files
Merge branch 'feature/open-source-code' into develop
2 parents 96e1603 + 3a1f675 commit d84d62f

File tree

3 files changed

+26
-2
lines changed

3 files changed

+26
-2
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015 Andrew Keller
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

conditional.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@
9494

9595
<hr>
9696

97-
<footer>
98-
<p>&copy; WimpyProgrammer.com 2015</p>
97+
<footer class="clearfix">
98+
<p class="pull-left">&copy; <a href="http://www.wimpyprogrammer.com/">WimpyProgrammer.com</a> 2015</p>
99+
<p class="pull-right"><a href="https://github.com/wimpyprogrammer/conditional-expression-parser">Fork me on GitHub</a> or <a href="https://github.com/wimpyprogrammer/conditional-expression-parser/issues">report an issue</a></p>
99100
</footer>
100101
</div> <!-- /container -->
101102

0 commit comments

Comments
 (0)