From 587bbd8fb48f92b68c1e5652eb813900f17a83b2 Mon Sep 17 00:00:00 2001
From: Angelos Chalaris <chalarangelo@gmail.com>
Date: Wed, 27 Dec 2017 17:26:33 +0200
Subject: [PATCH] Fixed a tiny error in a snippet

---
 snippets/randomHexColorCode.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/snippets/randomHexColorCode.md b/snippets/randomHexColorCode.md
index b5d31b828..4b273774b 100644
--- a/snippets/randomHexColorCode.md
+++ b/snippets/randomHexColorCode.md
@@ -5,12 +5,11 @@ Generates a random hexadecimal color code.
 Use `Math.random` to generate a random 24-bit(6x4bits) hexadecimal number. Use bit shifting and then convert it to an hexadecimal String using `toString(16)`.
 
 ```js
-<<<<<<< HEAD
-const randomHexColorCode = () => '#'+(Math.random()*0xFFFFFF<<0).toString(16);
-};
-=======
-const randomHexColorCode = () => '#' + (Math.random() * 0xFFFFFF << 0).toString(16);
->>>>>>> snippet-restructuring
+const randomHexColorCode = () => { 
+  let n = (Math.random() * 0xfffff | 0).toString(16); 
+  return '#' + (n.length !== 6 
+        ? (Math.random() * 0xf | 0).toString(16) + n : n); 
+}; 
 ```
 
 ```js