Skip to content

Commit

Permalink
Fix merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
@TomAugspurger
TomAugspurger committed Dec 11, 2017
1 parent dec6da3 commit 8bede1a
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions doc/source/whatsnew/v0.21.1.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ Documentation Changes

.. _whatsnew_0211.bug_fixes:

Bug Fixes
~~~~~~~~~

Conversion
^^^^^^^^^^

Expand Down

0 comments on commit 8bede1a

Please sign in to comment.