Merge from master

Wiston999 · Jan 14, 2019 · 82b9288 · 82b9288
2 parents 95131bd + ea94bd6
commit 82b9288
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/README.rst b/README.rst
@@ -62,16 +62,16 @@ The configuration string of the cube corresponds to the color of the stickers ac
                  | 6  | 7  | 8  |
                  ----------------
   -------------------------------------------------------------
-  | 9  | 10 | 11 | 18 | 19 | 20 | 28 | 29 | 30 | 37 | 38 | 39 |
+  | 9  | 10 | 11 | 18 | 19 | 20 | 27 | 28 | 29 | 36 | 37 | 38 |
   -------------------------------------------------------------
-  | 12 | 13 | 14 | 21 | 22 | 23 | 31 | 32 | 33 | 40 | 41 | 42 |
+  | 12 | 13 | 14 | 21 | 22 | 23 | 30 | 31 | 32 | 39 | 40 | 41 |
   -------------------------------------------------------------
-  | 15 | 16 | 17 | 24 | 25 | 26 | 34 | 35 | 36 | 43 | 44 | 45 |
+  | 15 | 16 | 17 | 24 | 25 | 26 | 33 | 34 | 35 | 42 | 43 | 44 |
   -------------------------------------------------------------
                  ----------------
-                 | 46 | 47 | 48 |
+                 | 45 | 46 | 47 |
                  ----------------
-                 | 49 | 59 | 59 |
+                 | 48 | 49 | 50 |
                  ----------------
                  | 51 | 52 | 53 |
                  ----------------
@@ -86,6 +86,7 @@ Colors used in the implementation are:
 -  [W]hite
 -  [Y]ellow
 -  [G]reen
+<<<<<<< HEAD
 
 NOTE
 ----
@@ -97,6 +98,8 @@ NOTE
 - **31** (Right center): **GREEN**
 - **40** (Back center): **ORANGE**
 - **49** (Down center): **WHITE**
+=======
+>>>>>>> master
 
 TODO
 ----