Update docstring for put.

1 files changed, 0 insertions, 3 deletions

diff --git a/gn2/wqflask/requests.py b/gn2/wqflask/requests.py
index e86f9fb7..16c56e13 100644
--- a/gn2/wqflask/requests.py
+++ b/gn2/wqflask/requests.py
@@ -14,11 +14,8 @@ def get(url, params=None, **kwargs) -> Either:
 def post(url, data=None, json=None, **kwargs) -> Either:
     """Wrap requests post method with Either monad"""
     return __wrap_response__(requests.post(url, data=data, json=json, **kwargs))
-<<<<<<< HEAD
-=======
 
 
 def put(url, data=None, json=None, **kwargs) -> Either:
     """Wrap requests put  method with Either monad"""
     return __wrap_response__(requests.put(url, data=data, json=json, **kwargs))
->>>>>>> 0a3dc5f5 (Update docstring for put.)