Marshall Bockrath-Vandegrift 5d64d83fd6 More nuanced merging of project defaults.		2013-10-14 19:59:18 -04:00
..
resources	Implement :uberjar-merge-with requested in issue #973.	2013-10-05 13:56:57 -04:00
project.clj	More nuanced merging of project defaults.	2013-10-14 19:59:18 -04:00