conflicten oplossen

Merge branch 'main' of https://github.com/inbo/inbolims # Conflicts: # .zenodo.json # CITATION.cff # DESCRIPTION # NAMESPACE # NEWS.md # R/lims_report.R # inst/CITATION # man/lims_report_xtab.Rd
inbo · Dec 21, 2023 · f1f6dbc · f1f6dbc
2 parents e4b91d2 + 645d34a
commit f1f6dbc
Show file tree

Hide file tree

Showing 9 changed files with 441 additions and 5 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -1,6 +1,10 @@
 {
   "title": "inbolims: Utilities to query the INBO lab analysis datawarehouse",
+<<<<<<< HEAD
   "version": "0.2.9",
+=======
+  "version": "0.2.6",
+>>>>>>> 645d34a87b17cf01931bc7850f92fc7b5fee6030
   "license": "GPL-3.0",
   "upload_type": "software",
   "description": "<p>Some utilities that expand the Lims program in INBO. It mainly\nfocuses on post-processing in connection with Quality Assurance.<\/p>",

diff --git a/CITATION.cff b/CITATION.cff
@@ -25,4 +25,8 @@ abstract: Some utilities that expand the Lims program in INBO. It mainly focuses
 identifiers:
 - type: url
   value: https://inbo.github.io/inbolims/
+<<<<<<< HEAD
 version: 0.2.9
+=======
+version: 0.2.6
+>>>>>>> 645d34a87b17cf01931bc7850f92fc7b5fee6030
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,13 @@
 Type: Package
 Package: inbolims
 Title: Utilities to query the INBO lab analysis datawarehouse
+<<<<<<< HEAD
 Version: 0.2.9
 Date: 2023-12-08
+=======
+Version: 0.2.6
+Date: 2023-11-16
+>>>>>>> 645d34a87b17cf01931bc7850f92fc7b5fee6030
 Authors@R: 
     person("Pieter", "Verschelde", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-9199-421X", affiliation = "Research Institute for Nature and Forest (INBO)"))

diff --git a/NAMESPACE b/NAMESPACE
@@ -2,14 +2,22 @@
 
 export(create_archief_labels_bat)
 export(date_as_text)
+<<<<<<< HEAD
 export(get_all_report_fields)
+=======
+export(get_available_report_fields)
+>>>>>>> 645d34a87b17cf01931bc7850f92fc7b5fee6030
 export(get_report_config_info)
 export(interprate_texture_content)
 export(lims_connect)
 export(lims_report_export)
 export(lims_report_samples)
 export(lims_report_xtab)
+<<<<<<< HEAD
 export(lims_result_statistics)
+=======
+export(lims_report_xtab_old)
+>>>>>>> 645d34a87b17cf01931bc7850f92fc7b5fee6030
 export(link_labo_id)
 export(parse_sql_report_query)
 export(parse_texture_content)
@@ -31,9 +39,13 @@ importFrom(ggplot2,element_blank)
 importFrom(ggplot2,element_text)
 importFrom(ggplot2,facet_wrap)
 importFrom(ggplot2,geom_boxplot)
+<<<<<<< HEAD
 importFrom(ggplot2,geom_histogram)
 importFrom(ggplot2,ggplot)
 importFrom(ggplot2,rel)
+=======
+importFrom(ggplot2,ggplot)
+>>>>>>> 645d34a87b17cf01931bc7850f92fc7b5fee6030
 importFrom(ggplot2,scale_y_log10)
 importFrom(ggplot2,theme)
 importFrom(ggplot2,xlab)

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # inbolims 0.2.9
 
 * Change the minimal necessary fields
@@ -12,6 +13,9 @@
 which makes customizing report field easier
 
 # inbolims 0.2.7
+=======
+# inbolims 0.2.6
+>>>>>>> 645d34a87b17cf01931bc7850f92fc7b5fee6030
 
 * Added a `NEWS.md` file to track changes to the package.
 * Add [`checklist`](https://inbo.github.io/checklist/) infrastructure.