From 2151790ad55e7b37460981e6a1d358ea8169156e 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: Wed, 13 Nov 2019 10:58:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java b/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java
index d5dba1b..d921db9 100644
--- a/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java
+++ b/app/src/main/java/com/example/cmknowledgegraph/LoginActivity.java
@@ -14,7 +14,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import com.example.PersonalCenter.Login;
 
-import Schema.OperaSchema;
+
 
 public class LoginActivity extends AppCompatActivity {
     public static String username;