rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'NoctuaNivalis-fix/#1308'

Browse Source
This commit is contained in:
Florian Bruhin 2016-02-15 22:08:50 +01:00
commit aad8dfc0ce
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.asciidoc
View File

@ -148,8 +148,8 @@ Contributors, sorted by the number of commits in descending order:
* Alexander Cogneau * Alexander Cogneau
* Martin Tournoij * Martin Tournoij
* Raphael Pierzina * Raphael Pierzina
* Joel Torstensson
* Felix Van der Jeugt * Felix Van der Jeugt
* Joel Torstensson
* Claude * Claude
* Patric Schmitz * Patric Schmitz
* meles5 * meles5

2
tests/conftest.py
View File

@ -172,7 +172,7 @@ def pytest_configure(config):
try: try:
disp = xvfbwrapper.Xvfb(width=800, height=600, colordepth=16) disp = xvfbwrapper.Xvfb(width=800, height=600, colordepth=16)
disp.start() disp.start()
except FileNotFoundError: except EnvironmentError:
# We run without Xvfb if it's unavailable. # We run without Xvfb if it's unavailable.
pass pass
else: else: