fix conflicts after merging master
[sgn.git] / mason / solgs / 
tree1713cb1db6155e75eb278edbbe1c9ff6d467690a
drwxr-xr-x   ..
drwxr-xr-x - anova
-rw-r--r-- 629 breeder_search_solgs.mas
drwxr-xr-x - cluster
-rw-r--r-- 267 default.mas
-rw-r--r-- 281 error_message.mas
drwxr-xr-x - footer
drwxr-xr-x - form
drwxr-xr-x - genetic_gain
drwxr-xr-x - gs
drwxr-xr-x - header
-rw-r--r-- 335 home.mas
drwxr-xr-x - log
drwxr-xr-x - model
drwxr-xr-x - page
drwxr-xr-x - pca
-rw-r--r-- 2063 population.mas
drwxr-xr-x - population
drwxr-xr-x - search
drwxr-xr-x - selection
drwxr-xr-x - selection_index
drwxr-xr-x - site
-rw-r--r-- 398 spinner.mas
drwxr-xr-x - submit
-rw-r--r-- 320 system_message.mas
drwxr-xr-x - util