merge conflicts

2017-10-20 15:33:36 +02:00 · 2017-10-20 15:33:36 +02:00 · 927449516c
parent f295ae5af0 a14ca1e7ab
commit 927449516c
1 changed files with 1 additions and 1 deletions
--- a/src/game-lib-a-1-event.js
+++ b/src/game-lib-a-1-event.js
@ -486,4 +486,4 @@ GameLib.Event.Subscribe = function(
            );
        }
    }
-};
+};