resolved merge conflict

2012-12-27 19:49:30 +01:00
parent 3f90055c69 fc1d075a7c
commit 596d0fdf77
1 changed files with 4 additions and 4 deletions
--- a/jedi/api_classes.py
+++ b/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)