Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshua Stauter committed Jul 16, 2015
2 parents 5f3fbe0 + 2dbd04d commit ec8667b
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions requestbin/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ def to_dict(self):
method=self.method,
headers=self.headers,
query_string=self.query_string,
raw=self.raw,
form_data=self.form_data,
body=self.body,
path=self.path,
Expand Down

0 comments on commit ec8667b

Please sign in to comment.