Merge pull request #226 from cmurphy/master
authorMorgan Haskel <morgan@puppetlabs.com>
Mon, 29 Dec 2014 19:22:00 +0000 (11:22 -0800)
committerMorgan Haskel <morgan@puppetlabs.com>
Mon, 29 Dec 2014 19:22:00 +0000 (11:22 -0800)
commit4fb88bb65d00dcf573ec873519fc6b78c40d2b56
tree99240f0d4c8b8bf5cfcabc4d317daacafc4859f3
parentce6b7d3b1ebf54b5b4073769ac38c342e2afc147
parent477666d6ccbf5c882ff0f2ffff117adbe9030779
Merge pull request #226 from cmurphy/master

Add IntelliJ files to the ignore list