resolved merge conflict

jedi/api_classes.py

@@ -93,8 +93,8 @@ class BaseDefinition(object):
     @property
     def line_nr(self):
         """
-        .. warning:: Deprecated! It's just here for backwards compatibility,
-            use `api_classes.BaseDefinition.line` instead.
+        .. deprecated:: 0.5.0
+           Use :attr:`.line` instead.
         .. todo:: Remove!
         """
         warnings.warn("Use line instead.", DeprecationWarning)