From a1b65c3e9c20e2ec9613404fa5b3e9810b99d162 Mon Sep 17 00:00:00 2001 From: sujijanguw Date: Tue, 7 Jul 2026 15:46:28 -0700 Subject: [PATCH] Update merge_conflict_ex_1.R Updated y value --- merge_conflict_ex_1.R | 1 + 1 file changed, 1 insertion(+) diff --git a/merge_conflict_ex_1.R b/merge_conflict_ex_1.R index 7e9a4a8..b0af8de 100644 --- a/merge_conflict_ex_1.R +++ b/merge_conflict_ex_1.R @@ -1,2 +1,3 @@ # i am creating a merge conflict. x <- rnorm(100) +y <- read.here("Desktop", "demo.csv") # updated by SJ