From 1e4293e499a2fb2ca943ac9d8ede64bc8b5436d7 Mon Sep 17 00:00:00 2001
From: LieutenantRoger <dijsky_2015@hotmail.com>
Date: Tue, 24 Nov 2020 17:33:58 +0800
Subject: [PATCH] cmd/faucet: improve handling of facebook post url (#21838)

Resolves #21532

Co-authored-by: roger <dengjun@huobi.com>
# Conflicts:
#	cmd/faucet/faucet.go
---
 diff.txt | 50 --------------------------------------------------
 1 file changed, 50 deletions(-)

diff --git a/diff.txt b/diff.txt
index c06076821..eb7e74dd2 100644
--- a/diff.txt
+++ b/diff.txt
@@ -2744,54 +2744,4 @@ Date:   Tue Nov 24 17:33:58 2020 +0800
     
     Co-authored-by: roger <dengjun@huobi.com>
 
-commit ead814616c094331915b03edd82d4200a7880178
-Merge: 6104ab6b6 f6e1aed50
-Author: Péter Szilágyi <peterke@gmail.com>
-Date:   Mon Nov 23 17:47:20 2020 +0200
-
-    Merge pull request #21890 from ligi/issue_templates
-    
-    github: Add new style of issue-templates
-
-commit 6104ab6b6d201df9e9d6372d1c35835d10c8f6ff
-Author: Martin Holst Swende <martin@swende.se>
-Date:   Mon Nov 23 15:49:16 2020 +0100
-
-    tests/fuzzers/bls1381: add bls fuzzer (#21796)
-    
-    * added bls fuzzer
-    
-    * crypto/bls12381: revert bls-changes, fixup fuzzer tests
-    
-    * fuzzers: split bls fuzzing into 8 different units
-    
-    * fuzzers/bls: remove (now stale) corpus
-    
-    * crypto/bls12381: added blsfuzz corpus
-    
-    * fuzzers/bls12381: fix the bls corpus
-    
-    * fuzzers: fix oss-fuzz script
-    
-    * tests/fuzzers: fixups on bls corpus
-    
-    * test/fuzzers: remove leftover corpus
-    
-    Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de>
-
-commit f6e1aed504d70197884da3031ae003755ef8e4d5
-Author: ligi <ligi@ligi.de>
-Date:   Mon Nov 23 13:12:42 2020 +0100
-
-    github: Add new style of issue-templates
-    
-    closes #20024
-
-commit bddf5aaa2f737569e5f96de3676c5123b82e60f0
-Author: Zsolt Felföldi <zsfelfoldi@gmail.com>
-Date:   Mon Nov 23 10:18:33 2020 +0100
-
-    les/utils: protect against WeightedRandomSelect overflow (#21839)
-    
-    Also fixes a bug in les/flowcontrol that caused the overflow.