From f11907e58f39287eeafef16ff80ba5603749b729 Mon Sep 17 00:00:00 2001 From: Jeremy Morrell Date: Wed, 16 Jun 2021 19:17:25 -0700 Subject: [PATCH 1/2] update title --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d48fb2b..13c7c2d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -reactris +reactris 2 - electric boogaloo ======== Simplified React tetris demo rendered to the DOM From 277535a53433e2083d11fc3b11008c60f85a595a Mon Sep 17 00:00:00 2001 From: Jeremy Morrell Date: Wed, 16 Jun 2021 19:18:43 -0700 Subject: [PATCH 2/2] add a conflict, hopefully --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 13c7c2d..6a65cc1 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ Simplified React tetris demo rendered to the DOM [Play Demo](http://jmorrell.github.io/reactris/) +This should be a conflicting change + ### Controls | Key | Action |