merge changes

Tino Hager

2018-06-27 ab5368e2795c3340aa8d7a12f973773572ceb28a

 src/cost_layer.h

@@ -1,7 +1,7 @@
#ifndef COST_LAYER_H
#define COST_LAYER_H
#include "params.h"
#include "layer.h"
#include "network.h"

typedef layer cost_layer;