merge with nitro

This commit is contained in:
Costa
2022-03-31 13:40:47 +02:00
parent 134133498b
commit ea45d8c845
-3
View File
@@ -1,13 +1,10 @@
library(shiny) library(shiny)
library(rhandsontable) library(rhandsontable)
<<<<<<< HEAD
library(tidyverse) library(tidyverse)
library(reshape2) library(reshape2)
library(Matrix) library(Matrix)
library(CitFuns) library(CitFuns)
=======
library(BDCIT) library(BDCIT)
>>>>>>> main
print(getwd()) print(getwd())
source("../sqlFunctions.R", encoding = "UTF-8") source("../sqlFunctions.R", encoding = "UTF-8")