          if 'beam_density' not in cfg:
              cfg['beam_density'] = util.env_opt('beam_density', 0.0)
          if 'pretrained_dims' not in cfg:
              cfg['pretrained_dims'] = self.vocab.vectors.data.shape[1]
          cfg.setdefault('cnn_maxout_pieces', 3)
          self.cfg = cfg
          if 'actions' in self.cfg:
              for action, labels in self.cfg.get('actions', {}).items():
                  for label in labels:
                      self.moves.add_action(action, label)
 
</s> remove         if 'actions' in self.cfg:
            for action, labels in self.cfg.get('actions', {}).items():
                for label in labels:
                    self.moves.add_action(action, label)
 </s> add  </s> remove             self.moves = self.TransitionSystem(self.vocab.strings, {})
 </s> add             self.moves = self.TransitionSystem(self.vocab.strings) </s> remove                 # Important that the labels be stored as a list! We need the
                # order, or the model goes out of synch
                self.cfg.setdefault('extra_labels', []).append(label)
 </s> add  </s> remove     np_label = doc.vocab.strings['NP']
 </s> add     if not len(doc):
        return
    np_label = doc.vocab.strings.add('NP') </s> remove             filtered_labels = [decompose(label)[0]
                               if freqs.get(label, cutoff) < cutoff
                               else label for label in labels]
 </s> add             filtered_labels = []
            for label in labels:
                if is_decorated(label) and freqs.get(label, 0) < cutoff:
                    filtered_labels.append(decompose(label)[0])
                else:
                    filtered_labels.append(label)
          if 'beam_density' not in cfg:
              cfg['beam_density'] = util.env_opt('beam_density', 0.0)
          if 'pretrained_dims' not in cfg:
              cfg['pretrained_dims'] = self.vocab.vectors.data.shape[1]

          self.cfg = cfg
          if 'actions' in self.cfg:
              for action, labels in self.cfg.get('actions', {}).items():
                  for label in labels:
                      self.moves.add_action(action, label)
keep keep keep keep replace keep keep keep keep keep
 Revert "Merge branch 'develop' of https://github.com/explosion/spaCy into develop"

This reverts commit c9ba3d3c2dc7067cf8bd55f878cec45a8c6d73d4, reversing
changes made to 92c26a35d425d4e8ca1b805ea776ea10f5ded3df. 
spacy/syntax/nn_parser.pyx