Resolve conflicts.

Author: Tim-ats-d

doc/source/visualdialog.rst

@@ -17,9 +17,9 @@ BaseTextBox
 
   The following methods are public:
 
-  .. autoattribute:: position
+  .. py:property:: position
 
-  .. autoattribute:: dimensions
+  .. py:property:: dimensions
 
   .. automethod:: framing_box
 

visualdialog/box.py

@@ -84,6 +84,8 @@ class BaseTextBox:
         Waiting time in milliseconds after writing a character contained
         in ``downtime_chars``.
         This defaults to ``600``.
+
+    :ivar var2: initial value: par2
     """
     @value_checker
     def __init__(
@@ -136,12 +138,8 @@ def __init__(
 
     @property
     def position(self) -> Tuple[int, int]:
-<<<<<<< HEAD
-        """Return a tuple contains x;y position of :class:`BaseTextBox`.
-=======
         """A property that returns a tuple contains x;y position of
         :class:`BaseTextBox`.
->>>>>>> 817377f (DialogBox.char_by_char and word_by_word nows return given text argument, start to improve doc.)
 
         The position represents the x;y coordinates of the top left
         corner of text box.
@@ -152,12 +150,8 @@ def position(self) -> Tuple[int, int]:
 
     @property
     def dimensions(self) -> Tuple[int, int]:
-<<<<<<< HEAD
-        """Return a tuple contains dimensions of :class:`BaseTextBox`.
-=======
         """A property that return a tuple contains dimensions of
         :class:`BaseTextBox`.
->>>>>>> 817377f (DialogBox.char_by_char and word_by_word nows return given text argument, start to improve doc.)
 
         :returns: Height and width of :class:`BaseTextBox`.
         """