mirror/kaka111222333-kaka111222333.github.io
1
0
Fork 0
mirror of https://github.com/kaka111222333/kaka111222333.github.io.git synced 2025-12-20 00:35:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/lemonchann/lemonchann.github.io

Browse Source 
# Conflicts:
#	_config.yml
This commit is contained in:
linlongchen
2019-11-18 13:36:26 +08:00
parent e359a00777 5a4b7f2ca0
commit d532c03da0
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
_config.yml
View File

@@ -68,6 +68,7 @@ gitalk:
repo: endworld repo: endworld
owner: FromEndWorld owner: FromEndWorld
<<<<<<< HEAD
# Enter your Google Analytics web tracking code (e.g. UA-2110908-2) to activate tracking # Enter your Google Analytics web tracking code (e.g. UA-2110908-2) to activate tracking
google_analytics: UA-143053266-1 google_analytics: UA-143053266-1