fixed caffe.proto after a mistaken rebase
fixed caffe.proto after a mistaken rebase

wangg12/caffe,tackgeun/caffe,gnina/gnina,longjon/caffe,longjon/caffe,gnina/gnina,tackgeun/caffe,gogartom/caffe-textmaps,CZCV/s-dilation-caffe,gnina/gnina,gnina/gnina,gogartom/caffe-textmaps,wangg12/caffe,gnina/gnina,tackgeun/caffe,CZCV/s-dilation-caffe,gnina/gnina,tackgeun/caffe,gogartom/caffe-textmaps,wangg12/caffe,gogartom/caffe-textmaps,wangg12/caffe,CZCV/s-dilation-caffe,longjon/caffe,CZCV/s-dilation-caffe,longjon/caffe