added merge of develop and feature branch between implementation and unit testing authored by Tim Terfort's avatar Tim Terfort
...@@ -25,4 +25,4 @@ ...@@ -25,4 +25,4 @@
* [External Python Libraries](python-libraries) * [External Python Libraries](python-libraries)
## Known Limitations ## Known Limitations
* Layer type "MemoryData" can't be used to run caffe inside of Barista. However, it can be used to build and export a net. see #200 * Layer types "MemoryData" and "Input" can't be used to run caffe inside of Barista. However, it can be used to build and export a net. see #200
\ No newline at end of file \ No newline at end of file