From 2c88e4e3ba071eb8a45f37cd74c8f829d39e44ad Mon Sep 17 00:00:00 2001 From: kevgliss Date: Mon, 23 Nov 2015 16:42:14 -0800 Subject: [PATCH] fixing conflict --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index e9da437f..2874805f 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -14,7 +14,7 @@ Flask-Principal==0.4.0 Flask-Mail==0.9.1 SQLAlchemy-Utils==0.31.3 BeautifulSoup4 -requests==2.8.0 +requests==2.8.1 psycopg2==2.6.1 arrow==0.7.0 boto==2.38.0 # we might make this optional