Browse code

push to bioc

Emanuel Soda authored on 13/05/2022 17:10:04
Showing3 changed files

... ...
@@ -18,7 +18,4 @@ docs
18 18
 /vignettes/*.md
19 19
 /vignettes/*.R
20 20
 
21
-<<<<<<< HEAD
22
-=======
23 21
 README.Rmd
24
->>>>>>> 8bc088e (spero di essermi salvato)
... ...
@@ -1,9 +1,3 @@
1
-<<<<<<< HEAD
2
-YEAR: 2021
3
-COPYRIGHT HOLDER: ScreenR authors
4
-
5
-
6
-=======
7 1
 YEAR: 2022
8 2
 COPYRIGHT HOLDER: ScreenR authors
9
->>>>>>> 8bc088e (spero di essermi salvato)
3
+
... ...
@@ -1,10 +1,7 @@
1 1
 # MIT License
2 2
 
3
-<<<<<<< HEAD
4
-Copyright (c) 2021 ScreenR authors
5
-=======
6 3
 Copyright (c) 2022 ScreenR authors
7
->>>>>>> 8bc088e (spero di essermi salvato)
4
+
8 5
 
9 6
 Permission is hereby granted, free of charge, to any person obtaining a copy
10 7
 of this software and associated documentation files (the "Software"), to deal
... ...
@@ -23,7 +20,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
23 20
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
24 21
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
25 22
 SOFTWARE.
26
-<<<<<<< HEAD
27 23
 
28
-=======
29
->>>>>>> 8bc088e (spero di essermi salvato)