From ea45d8c845f167fc770bacd5fb601be1f5626665 Mon Sep 17 00:00:00 2001
From: Costa <47926492N@ICO.SCS.local>
Date: Thu, 31 Mar 2022 13:40:47 +0200
Subject: [PATCH] merge with nitro

---
 BDAccess/app.R | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/BDAccess/app.R b/BDAccess/app.R
index 99ff87f..f1143cd 100644
--- a/BDAccess/app.R
+++ b/BDAccess/app.R
@@ -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")