Merge remote-tracking branch 'origin/master'

# Conflicts: # app/src/main/res/layout/activity_main.xml
6 years ago · 2151790ad5
parent 58ac178221
commit 2151790ad5
1 changed files with 1 additions and 1 deletions
--- 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;