From 7c33fb1d28658091e885c8885a451d2b51fe8269 Mon Sep 17 00:00:00 2001
From: Craig <craig@garagescript.org>
Date: Sat, 9 Jun 2018 15:58:20 -0700
Subject: [PATCH 1/2] solved js0_9

---
 curriculum/js0/9.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/curriculum/js0/9.js b/curriculum/js0/9.js
index f184d6a8a..58005f1b4 100644
--- a/curriculum/js0/9.js
+++ b/curriculum/js0/9.js
@@ -7,7 +7,8 @@
  */
 
 const solution = (a, b) => {
-  return () => {};
+  return (c) => {
+   return a+b+c};
 };
 
 module.exports = {

From f604fd8424710535a8dd68bbd99d9051560e6120 Mon Sep 17 00:00:00 2001
From: Craig <craig@garagescript.org>
Date: Sat, 16 Jun 2018 14:12:51 -0700
Subject: [PATCH 2/2] cleaned code for js0_9

---
 curriculum/js0/9.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/curriculum/js0/9.js b/curriculum/js0/9.js
index 58005f1b4..d1f4287b5 100644
--- a/curriculum/js0/9.js
+++ b/curriculum/js0/9.js
@@ -8,7 +8,12 @@
 
 const solution = (a, b) => {
   return (c) => {
+<<<<<<< Updated upstream
    return a+b+c};
+=======
+    return a+b+c;
+  };
+>>>>>>> Stashed changes
 };
 
 module.exports = {