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)
commit6764e22f35cdca47358125d36ce9b3f772ca2837
tree28175bc7332c616d2ca0c0987c6d52edde40c83e
parent7b5459889b6186b8e32cbe2b23dfd473dd1aa36e
parentc1faaa36ca76d15c078f6873c507b499429280db
Merge pull request #859 from beam2d/fix-cifar-lrn-region

Fix conflict on setting of LRN layers between train/test net and deploy net