Resolve merge conflicts

This commit is contained in:
Mike Croucher 2015-04-01 11:44:20 +01:00
commit e82b5fe773
31 changed files with 1729 additions and 731 deletions

View file

@ -15,4 +15,4 @@ import netpbmfile
import inference_plots
import maps
import img_plots
from ssgplvm import SSGPLVM_plot
from ssgplvm import SSGPLVM_plot