Skip to content

Commit

Permalink
re #8: fix merge of flag aliases
Browse files Browse the repository at this point in the history
  • Loading branch information
biojppm committed Jun 6, 2020
1 parent a77d128 commit 7747ece
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/c4/cmany/conf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import sys
import os.path as osp
from collections import OrderedDict as odict
from . import util
Expand Down Expand Up @@ -95,7 +94,7 @@ def is_dict(d):
self._dump[k] = other._dump[k]
elif src is not None:
self._dump[k] = other._dump[k]
self.flag_aliases = self.flag_aliases.merge_from(other.flag_aliases)
self.flag_aliases.merge_from(other.flag_aliases)

def get_val(self, name_sub, where=None):
if where is None:
Expand Down

0 comments on commit 7747ece

Please sign in to comment.