Merge branch 'master' of https://github.molgen.mpg.de/loosolab/MARMoSET

# Conflicts: # R/load_meta_functions.R
loosolab · Dec 5, 2019 · f2aee4c · f2aee4c
2 parents 3d509d6 + 71da2bb
commit f2aee4c
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 0 deletions.
diff --git a/R/load_meta_functions.R b/R/load_meta_functions.R
@@ -91,6 +91,7 @@ flatten_json <- function(json)
       json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]][["Flow [nl/min]"]] <- flow
       json [["Group"]][[group_numb]][["Instruments"]][["Thermo EASY-nLC"]][["Method"]][["Gradient"]][["Mixture [%B]"]] <- mixture
     }
+
   }
 
   return(json %>% rlist::list.flatten())

diff --git a/R/sysdata.rda b/R/sysdata.rda
diff --git a/data/tmt_list.rda b/data/tmt_list.rda
diff --git a/inst/bin/MARMoSET.exe b/inst/bin/MARMoSET.exe
diff --git a/inst/bin/MARMoSET.pdb b/inst/bin/MARMoSET.pdb
diff --git a/inst/extdata/term_matching_tables.ods b/inst/extdata/term_matching_tables.ods