Merge branch 'em' into 'master'

bob.learn.em depnds on bob.db.iris for building docs [skip ci] See merge request !18

Merge branch 'em' into 'master'
bob.learn.em depnds on bob.db.iris for building docs [skip ci] See merge request !18
14837a74 · Amir MOHAMMADI · 085c4eae · 0aba3424 · 14837a74
Commit 14837a74 authored May 31, 2017 by Amir MOHAMMADI
--- a/core.txt
+++ b/core.txt
@@ -19,9 +19,9 @@ bob.learn.activation
 bob.learn.libsvm
 bob.learn.linear
 bob.learn.mlp
-bob.learn.em
 bob.learn.boosting
 bob.db.iris
+bob.learn.em
 bob.db.wine
 bob.db.mnist
 bob.db.atnt