package com.example.zhoujianxing.gitdemo;

import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;

public class MainActivity extends AppCompatActivity {

    private static final String TAG = "MainActivity";

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_main);

        Log.d(TAG,"my name is zhou");

        Log.d(TAG,"my name is Jian");

        Log.d(TAG,"my name is xing");
    }
}

@@ -445,90 +445,10 @@
  is 
-zhou%22);%0A%0A        Log.d(TAG,%22my name is Jian%22);%0A%0A        Log.d(TAG,%22my name is xing
+xu
 %22);%0A

add merge