DMRlink/.gitignore

.DS_Store
.dropbox
<<<<<<< HEAD
<<<<<<< HEAD
Icon
=======
Icon
>>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389
=======
Icon
>>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389
Merge branch 'master' of https://github.com/n0mjs710/IPSC Conflicts: .gitignore 2013-06-28 21:28:25 -04:00			`.DS_Store`
			`.dropbox`
			`<<<<<<< HEAD`
fix 2013-06-28 21:29:01 -04:00			`<<<<<<< HEAD`
Update .gitignore 2013-06-28 21:26:35 -04:00			`Icon`
fix 2013-06-28 21:29:01 -04:00			`=======`
Merge branch 'master' of https://github.com/n0mjs710/IPSC Conflicts: .gitignore 2013-06-28 21:28:25 -04:00			`Icon`
fix 2013-06-28 21:29:01 -04:00			`>>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389`
Merge branch 'master' of https://github.com/n0mjs710/IPSC Conflicts: .gitignore 2013-06-28 21:28:25 -04:00			`=======`
			`Icon`
			`>>>>>>> b8ce998cf4206fbbba382f94e0224bacd4713389`