          linear_model = (
              _preprocess_doc
              >> LinearModel(nr_class)
          )
          #model = linear_model >> logistic
  
          model = (
              (linear_model | cnn_model)
              >> zero_init(Affine(nr_class, nr_class*2, drop_factor=0.0))
              >> logistic
          )
 
</s> remove                 ) ** 2, pad=2
 </s> add                 ) ** depth, pad=depth </s> remove                 clone(LayerNorm(Maxout(hidden_width, hidden_width)), depth-1),
 </s> add                 clone(Maxout(hidden_width, hidden_width), depth-1), </s> remove         for doc in docs:
            if len(doc) >= self.max_length:
                msg = (
                    "Pattern length (%d) >= phrase_matcher.max_length (%d). "
                    "Length can be set on initialization, up to 10."
                )
                raise ValueError(msg % (len(doc), self.max_length))
 </s> add  </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 
          linear_model = (
              _preprocess_doc
              >> LinearModel(nr_class)
          )


          model = (
              (linear_model | cnn_model)
              >> zero_init(Affine(nr_class, nr_class*2, drop_factor=0.0))
              >> logistic
          )
keep keep keep keep replace 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/_ml.py