Resolved merge conflict

1 files changed, 16 insertions, 0 deletions

diff --git a/android/src/com/ilotterytea/maxoning/AndroidLauncher.java b/android/src/com/ilotterytea/maxoning/AndroidLauncher.java
new file mode 100644
index 0000000..f217cb9
--- /dev/null
+++ b/android/src/com/ilotterytea/maxoning/AndroidLauncher.java
@@ -0,0 +1,16 @@
+package com.ilotterytea.maxoning;
+
+import android.os.Bundle;
+
+import com.badlogic.gdx.backends.android.AndroidApplication;
+import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
+import com.ilotterytea.maxoning.MaxonGame;
+
+public class AndroidLauncher extends AndroidApplication {
+	@Override
+	protected void onCreate (Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
+		initialize(new MaxonGame(), config);
+	}
+}