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

Fix merge error in trello client. (#377) #378

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix merge error in trello client. (#377) #378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions trello/trelloclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,8 @@ def fetch_json(
if query_params is None:
query_params = {}

<<<<<<< jsadowski/feature/http-user-agent
# add user agent header to fetch_json requests
headers['User-Agent'] = generate_user_agent()

# if files specified, we don't want any data
=======
# Per trello api specification payload should not be present on get requests.
>>>>>>> master
data = None

# if files specified, we don't want any data
if files is None:
Expand Down