From: Ben Beltran Date: Mon, 3 Feb 2014 15:51:29 +0000 (-0600) Subject: Proper merge for gitignore X-Git-Url: https://git.r.bdr.sh/rbdr/super-polarity/commitdiff_plain/830829dec0596760d0cba38d959ab2646112f61b?ds=sidebyside;hp=830829dec0596760d0cba38d959ab2646112f61b Proper merge for gitignore ---