From cb2e85552630016ebac1a3aa9fc12e25070d3aef Mon Sep 17 00:00:00 2001
From: Giovanni Caruso <gc4117@cloud-vm-36-76.doc.ic.ac.uk>
Date: Wed, 30 Oct 2019 12:48:45 +0000
Subject: [PATCH] Fixed width initialised to the wrong value

---
 src/canvas.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/canvas.js b/src/canvas.js
index 5577524..6934d17 100644
--- a/src/canvas.js
+++ b/src/canvas.js
@@ -189,11 +189,10 @@ export function setStrokeColour(colour) {
   stroke_colour = colour
 }
 
-<<<<<<< HEAD
 export function getStrokeColour() {
   return stroke_colour
-=======
+}
+
 export function setStrokeRadius(radius) {
   stroke_radius = radius
->>>>>>> Implement brush size
 }
-- 
GitLab