Merge pull request #859 from beam2d/fix-cifar-lrn-region
authorJeff Donahue <jeff.donahue@gmail.com>
Tue, 5 Aug 2014 16:22:49 +0000 (09:22 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Tue, 5 Aug 2014 16:22:49 +0000 (09:22 -0700)
Fix conflict on setting of LRN layers between train/test net and deploy net


Trivial merge