diff --git a/merge_conflict_ex_1.R b/merge_conflict_ex_1.R index 18cf8ca..62a911a 100644 --- a/merge_conflict_ex_1.R +++ b/merge_conflict_ex_1.R @@ -1,5 +1,6 @@ # i am creating a merge conflict. x <- rnorm(100) - mean(x) sd(x) + +y <- read.here("Desktop", "demo.csv") # updated by SJ \ No newline at end of file