fixed caffe.proto after a mistaken rebase
authorqipeng <pengrobertqi@163.com>
Tue, 29 Jul 2014 17:06:32 +0000 (10:06 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Mon, 1 Sep 2014 18:33:41 +0000 (11:33 -0700)
commitb0ec5314f407f47bd2b593c609f88cf23ffa32cf
tree68420bc6e6318e99859eb6b7f8e816084db3a618
parenta683c40d63b79dcb4e2407d59335fb7f8129c82f
fixed caffe.proto after a mistaken rebase
src/caffe/proto/caffe.proto