diff options
| author | Alexander van Ratingen <470642+alvra@users.noreply.github.com> | 2019-10-12 12:44:40 +0200 |
|---|---|---|
| committer | Alexander van Ratingn <alexander@vanratingen.me> | 2019-10-12 12:44:40 +0200 |
| commit | d9cdde75504c23e0f6ac214c86a2a1185f47b2f9 (patch) | |
| tree | 04513c203402e82dd4442ea558bbaa0f4db15930 /requirements | |
| parent | ca7b4c3d16c90b8efff83491f30625e6ea036707 (diff) | |
| parent | 1b26e63e3ebce49570e57f6a5233af15278a518b (diff) | |
| download | django-compressor-d9cdde75504c23e0f6ac214c86a2a1185f47b2f9.tar.gz | |
Merge
Diffstat (limited to 'requirements')
| -rw-r--r-- | requirements/tests.txt | 2 | ||||
| -rw-r--r-- | requirements/tests.txt.orig | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/requirements/tests.txt b/requirements/tests.txt index a595d22..428c09a 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -2,7 +2,7 @@ flake8==3.5.0 coverage==4.5.1 html5lib==1.0.1 mock==2.0.0 -Jinja2==2.10.0 +Jinja2==2.10.1 lxml==4.2.5 beautifulsoup4==4.6.3 django-sekizai==0.10.0 diff --git a/requirements/tests.txt.orig b/requirements/tests.txt.orig new file mode 100644 index 0000000..b4755ae --- /dev/null +++ b/requirements/tests.txt.orig @@ -0,0 +1,16 @@ +flake8==3.5.0 +coverage==4.5.1 +html5lib==1.0.1 +mock==2.0.0 +<<<<<<< HEAD +Jinja2==2.10.0 +======= +Jinja2==2.10.1 +>>>>>>> 1b26e63e3ebce49570e57f6a5233af15278a518b +lxml==4.2.5 +beautifulsoup4==4.6.3 +django-sekizai==0.10.0 +csscompressor==0.9.5 +rcssmin==1.0.6 +rjsmin==1.1.0 +brotli==1.0.6 |