Merge pull request #2168 from longjon/spurious-net-includes
authorJeff Donahue <jeff.donahue@gmail.com>
Thu, 14 May 2015 22:14:05 +0000 (15:14 -0700)
committerJeff Donahue <jeff.donahue@gmail.com>
Thu, 14 May 2015 22:14:05 +0000 (15:14 -0700)
Remove spurious inclusions of net.hpp

1  2 
include/caffe/data_layers.hpp
include/caffe/neuron_layers.hpp

Simple merge
Simple merge