8000 Remove merge artifact · sangsiri/twilio-python@b1f7f3d · GitHub
[go: up one dir, main page]
Skip to content

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
8000
Appearance settings

Commit b1f7f3d

Browse files
jingmingjingming
committed
Remove merge artifact
1 parent 20f2ed6 commit b1f7f3d

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

‎tests/test_make_request.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,4 +119,3 @@ def test_proxy_info(http_mock, resp_mock):
119119
assert_equal(proxy_info.proxy_host, 'example.com')
120120
assert_equal(proxy_info.proxy_port, 8080)
121121
assert_equal(proxy_info.proxy_type, PROXY_TYPE_SOCKS5)
122-
>>>>>>> parent of 6bf0e94... Merge remote-tracking branch 'origin/signal-beta' into edge

0 commit comments

Comments
 (0)
0