Skip to content

Commit

Permalink
Merge pull request #618 from jupyter/blink1073-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
blink1073 committed Apr 9, 2022
2 parents fc31fbb + 49c853e commit bbf621e
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions nbdime/config.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

import os

from ipython_genutils import py3compat
from jupyter_core.paths import jupyter_config_path

from traitlets import Unicode, Enum, Integer, Bool, HasTraits, Dict, TraitError
Expand Down Expand Up @@ -81,7 +80,7 @@ def build_config(entrypoint, include_none=False):
# Get config from disk:
disk_config = {}
path = jupyter_config_path()
path.insert(0, py3compat.getcwd())
path.insert(0, os.getcwd())
for c in _load_config_files('nbdime_config', path=path):
recursive_update(disk_config, c, include_none)

Expand Down

0 comments on commit bbf621e

Please sign in to comment.