Merge remote-tracking branch 'origin/master'

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