Merge branch 'master' of github.com:BVLC/caffe into brody

brodyh · Oct 8, 2014 · f138544 · f138544
2 parents 0c8a06e + 30f3daf
commit f138544
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/caffe/solver.cpp b/src/caffe/solver.cpp
@@ -23,7 +23,7 @@ template <typename Dtype>
 Solver<Dtype>::Solver(const string& param_file)
     : net_() {
   SolverParameter param;
-  ReadProtoFromTextFile(param_file, &param);
+  ReadProtoFromTextFileOrDie(param_file, &param);
   Init(param);
 }