From 5b1d992b44b6233f4c894bf19487d2e73d9e6f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=93=88=E5=93=88=E5=93=88=E5=93=88=E5=93=88=E5=A3=AB?=
 =?UTF-8?q?=E5=A5=87?= <1045352474@qq.com>
Date: Fri, 15 Nov 2019 10:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_main.xml
---
 .../main/java/com/example/cmknowledgegraph/RegisterActivity.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java b/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java
index bd99740..fa9db11 100644
--- a/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java
+++ b/app/src/main/java/com/example/cmknowledgegraph/RegisterActivity.java
@@ -12,7 +12,6 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import com.example.PersonalCenter.Register;
 
-import Schema.OperaSchema;
 
 public class RegisterActivity extends AppCompatActivity {
     public static int regester = 0;