merge with nitro

2022-03-31 13:40:47 +02:00
parent 134133498b
commit ea45d8c845
1 changed files with 0 additions and 3 deletions
@@ -1,13 +1,10 @@
 library(shiny)
 library(rhandsontable)
-<<<<<<< HEAD
 library(tidyverse)
 library(reshape2)
 library(Matrix)
 library(CitFuns)
-=======
 library(BDCIT)
->>>>>>> main

 print(getwd())
 source("../sqlFunctions.R", encoding = "UTF-8")