Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

第一次修改 #46

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

第一次修改 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5757aa9
第一次修改
PassionKey Nov 21, 2020
4c6b000
第二次修改
PassionKey Nov 21, 2020
87d7438
Merge pull request #1 from PassionKey/2020_1121_2357
PassionKey Nov 21, 2020
18abbdb
第三次修改
PassionKey Nov 21, 2020
a2351e1
Merge remote-tracking branch 'origin/master' into master
PassionKey Nov 21, 2020
7bfc7ea
第四次修改
PassionKey Nov 21, 2020
967d556
test1
PassionKey Nov 21, 2020
da7682d
test2
PassionKey Nov 21, 2020
a9dff77
test2
PassionKey Nov 21, 2020
f4421f6
test4
PassionKey Nov 21, 2020
636aae1
Merge remote-tracking branch 'origin/master' into master
PassionKey Nov 21, 2020
83ee94e
test4
PassionKey Nov 21, 2020
124511a
test4
PassionKey Nov 27, 2020
1a133d3
假如一行代码
PassionKey Nov 27, 2020
4786427
第三行代码
PassionKey Nov 27, 2020
31eb14b
第三行代码
PassionKey Nov 27, 2020
0eae3c0
add
PassionKey Nov 27, 2020
c408624
Merge branch 'just_for_merge' into master
PassionKey Nov 27, 2020
edc5117
add02
PassionKey Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added demo/feature01
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions demo/feature02
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
add02
3 changes: 3 additions & 0 deletions demo/master1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
这是第一个文件我想要更新的
在master加入这一行代码
第三行代码
5 changes: 3 additions & 2 deletions shareutil/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true"
android:supportsRtl="false"

>
<activity
android:name="com.sina.weibo.sdk.component.WeiboSdkBrowser"
Expand Down Expand Up @@ -53,5 +54,5 @@
android:exported="true"
android:targetActivity="me.shaohui.shareutil._ShareActivity"/>
</application>

<!--第三次修改-->
</manifest>
1 change: 1 addition & 0 deletions shareutil/test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
第一次