fixed caffe.proto after a mistaken rebase