Merge pull request #188 from bsalomon/master
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Fri, 4 Mar 2016 04:57:51 +0000 (21:57 -0700)
committerJohn Kessenich <johnkslang@users.noreply.github.com>
Fri, 4 Mar 2016 04:57:51 +0000 (21:57 -0700)
Fix line endings in Test/100.conf


Trivial merge