I came clean on my lie

conflict-files/partners-3.R

@@ -1,7 +1,11 @@
 ## partners-3: philosophy
 
 ponder <- function(thing) {
-  paste0("If a ", thing, " falls in the forest and no one tweets about it, did it really happen?")
+  paste0(
+    "If a ",
+    thing,
+    " falls in the forest and no one tweets about it, did it really happen?"
+  )
 }
 
-ponder("tree")
+ponder("treeeeeeeees")

conflict-files/partners-4.R

@@ -1,7 +1,11 @@
 ## partners-4: biking
 
 bike_excuse <- function(miles) {
-  paste0("Yeah I only biked ", miles, " miles today, but it was uphill. Both ways. Into the wind.")
+  paste0(
+    "Yeah I only biked ",
+    miles,
+    " kilometers today, but it was uphill. Both ways. Into the wind."
+  )
 }
 
 bike_excuse(3)

sop-demo.Rproj

@@ -0,0 +1,13 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX

team/Lennon.R

@@ -0,0 +1,6 @@
+greet <- function(name) {
+    paste0("Welcome to the great state of New Jersey, ", name)
+}
+
+
+greet("Lennon")

team/danielle.R

@@ -0,0 +1,7 @@
+# team/danielle.R
+
+greet <- function(name) {
+  paste0("Welcome to the underrated and first state of Delaware ", name, "!!!")
+}
+
+greet("Tracey")

team/erin.R

@@ -0,0 +1,5 @@
+#team/erin.R
+
+greet <- function(name){paste0("hola ", name)}
+
+greet("Erin")

team/jason.R

@@ -0,0 +1,9 @@
+# team/jason.R
+greet <- function(name) {
+  paste0("The best state in the nation, 
+  New 
+  Jersey, 
+  welcomes you, ", name)
+}
+
+greet("Jason")

team/mary.R

@@ -0,0 +1,13 @@
+# team/tracey.R
+greet <- function(name) {
+  paste0("The best state in the nation, 
+  New 
+  Jersey, 
+  welcomes you, ", name)
+}
+
+greet("Mary")
+
+
+
+

team/pol.R

@@ -0,0 +1,4 @@
+greet <- function(name) {
+  paste0("Welcome to the great city of Barcelona, ", name)
+}
+greet("Pol")

team/robert.R

@@ -0,0 +1,5 @@
+greet <- function(name) {
+  paste0("Welcome ", name, " to the much better state of California.")
+}
+
+greet("Ranjit")

team/shradhey.R

@@ -0,0 +1,7 @@
+# team/shradhey.R
+# did something new
+greet <- function(name) {
+  paste0("First branch ever by ", name)
+}
+
+greet("Shradhey")