From 035fe868281ff2daef9fcef46db9ab107b618a7c Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Tue, 24 Oct 2023 10:22:07 +0000
Subject: [PATCH] Update CITATION.cff

---
 CITATION.cff | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/CITATION.cff b/CITATION.cff
index bbe6d27c..a3b792cc 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -7,6 +7,7 @@ cff-version: 1.2.0
 message: 'To cite package "readepi" in publications use:'
 type: software
 license: MIT
+<<<<<<< HEAD
 title: 'readepi: Read Data from Health Information Systems'
 version: 0.0.1
 abstract: Data import from several health information systems ('HIS'). The current
@@ -16,6 +17,17 @@ authors:
 - family-names: Mané
   given-names: Karim
   email: karim.mane@lshtm.ac.uk
+=======
+title: 'readepi: Read Data From Health Information Systems'
+version: 0.1.0
+abstract: Data import from several health information systems ('HIS'). The current
+  version of the package covers 'HIS' such as 'MS SQL', 'MySQL', 'PostGRESQL' servers,
+  'REDCap', 'DHIS2' and 'Fingertips'.
+authors:
+- family-names: Mané
+  given-names: Karim
+  email: lshkm1@lshtm.ac.uk
+>>>>>>> b0c6897 (Update CITATION.cff)
   orcid: https://orcid.org/0000-0002-9892-2999
 preferred-citation:
   type: manual
@@ -23,7 +35,11 @@ preferred-citation:
   authors:
   - family-names: Mané
     given-names: Karim
+<<<<<<< HEAD
     email: karim.mane@lshtm.ac.uk
+=======
+    email: lshkm1@lshtm.ac.uk
+>>>>>>> b0c6897 (Update CITATION.cff)
     orcid: https://orcid.org/0000-0002-9892-2999
   - family-names: Mohammed
     given-names: Nuredin
@@ -36,11 +52,19 @@ preferred-citation:
   year: '2023'
   url: https://github.com/epiverse-trace/readepi
 repository-code: https://github.com/epiverse-trace/readepi
+<<<<<<< HEAD
 url: https://epiverse-trace.github.io/readepi/
 contact:
 - family-names: Mané
   given-names: Karim
   email: karim.mane@lshtm.ac.uk
+=======
+url: https://epiverse-trace.github.io/readepi
+contact:
+- family-names: Mané
+  given-names: Karim
+  email: lshkm1@lshtm.ac.uk
+>>>>>>> b0c6897 (Update CITATION.cff)
   orcid: https://orcid.org/0000-0002-9892-2999
 keywords:
 - data-import
@@ -63,6 +87,7 @@ references:
     orcid: https://orcid.org/0000-0001-9754-0393
   year: '2023'
 - type: software
+<<<<<<< HEAD
   title: data.table
   abstract: 'data.table: Extension of `data.frame`'
   notes: Imports
@@ -77,6 +102,8 @@ references:
     email: asrini@pm.me
   year: '2023'
 - type: software
+=======
+>>>>>>> b0c6897 (Update CITATION.cff)
   title: DBI
   abstract: 'DBI: R Database Interface'
   notes: Imports
@@ -236,6 +263,7 @@ references:
     given-names: Jeffrey
   year: '2023'
 - type: software
+<<<<<<< HEAD
   title: bookdown
   abstract: 'bookdown: Authoring Books and Technical Documents with R Markdown'
   notes: Suggests
@@ -248,6 +276,8 @@ references:
     orcid: https://orcid.org/0000-0003-0645-5666
   year: '2023'
 - type: software
+=======
+>>>>>>> b0c6897 (Update CITATION.cff)
   title: httptest
   abstract: 'httptest: A Test Environment for HTTP Requests'
   notes: Suggests
@@ -260,6 +290,7 @@ references:
     orcid: https://orcid.org/0009-0002-7992-3520
   year: '2023'
 - type: software
+<<<<<<< HEAD
   title: kableExtra
   abstract: 'kableExtra: Construct Complex Table with ''kable'' and Pipe Syntax'
   notes: Suggests
@@ -272,6 +303,8 @@ references:
     orcid: https://orcid.org/0000-0002-3386-6076
   year: '2023'
 - type: software
+=======
+>>>>>>> b0c6897 (Update CITATION.cff)
   title: knitr
   abstract: 'knitr: A General-Purpose Package for Dynamic Report Generation in R'
   notes: Suggests
@@ -338,6 +371,9 @@ references:
     email: hadley@posit.co
   year: '2023'
   version: '>= 3.0.0'
+<<<<<<< HEAD
 identifiers:
 - type: url
   value: https://github.com/epiverse-trace/readepi/
+=======
+>>>>>>> b0c6897 (Update CITATION.cff)