Merge pull request #378 from longjon/no-merge-duplicates
authorJeff Donahue <jeff.donahue@gmail.com>
Wed, 30 Apr 2014 19:53:32 +0000 (12:53 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Wed, 30 Apr 2014 19:53:32 +0000 (12:53 -0700)
commitb654d9d8b005778a9cae9c1808aa0b3752dbd421
tree6602695d93ea4621e147acf3bada9dfbb915750e
parentb2589569d257c8b6a90d5333065194e0eab01e83
parentb2b1e9951cffcc35b2228fb11c7a9cbbc231cbf3
Merge pull request #378 from longjon/no-merge-duplicates

Note the last added layer/params in caffe.proto to prevent conflicts