Skip to content

Commit 86ceaf4

Browse files
author
GideonSenku
committed
Merge remote-tracking branch 'origin/master'
2 parents 12d9ffa + 887b6fe commit 86ceaf4

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎QuantumultX_Local_Cookie.conf‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,8 @@ https:\/\/www.maomicd.com\/plugin.php\?id=k_misign:sign&operation=qiandao url sc
107107
^https://pm\.m\.fenqile\.com/route0014/star/sign/sign.json url script-request-body https://raw.githubusercontent.com/chavyleung/scripts/master/fenqile/fenqile.cookie.js
108108

109109
#樊登读书
110-
^https://api\.dushu\.io/CheckIn url script-request-body https://raw.githubusercontent.com/chavyleung/scripts/master/fandeng/fandeng.cookie.js
110+
<<<<<<< HEAD
111+
^https://api\.dushu\.io/CheckIn url script-request-body https://raw.githubusercontent.com/chavyleung/scripts/master/fandeng/fandeng.cookie.js
112+
=======
113+
^https://api\.dushu\.io/CheckIn url script-request-body https://raw.githubusercontent.com/chavyleung/scripts/master/pandeng/pandeng.cookie.js
114+
>>>>>>> origin/master

‎QuantumultX_Local_Task.conf‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,8 @@
6565
# 分期乐
6666
1 0 * * * chavyleung/fenqile/fenqile.js
6767
#樊登读书
68-
1 0 * * * chavyleung/fandeng/fandeng.js
68+
<<<<<<< HEAD
69+
1 0 * * * chavyleung/fandeng/fandeng.js
70+
=======
71+
1 0 * * * chavyleung/pandeng/pandeng.js
72+
>>>>>>> origin/master

0 commit comments

Comments
 (0)