Show More
| @@ -88,11 +88,7 b' match on a doctest assertion, an error will occur.' | |||||
| 88 | In [1]: x = 'hello world' |
|
88 | In [1]: x = 'hello world' | |
| 89 |
|
89 | |||
| 90 | # this will raise an error if the ipython output is different |
|
90 | # this will raise an error if the ipython output is different | |
| 91 | <<<<<<< HEAD |
|
|||
| 92 | @doctest"" |
|
|||
| 93 | ======= |
|
|||
| 94 | @doctest |
|
91 | @doctest | |
| 95 | >>>>>>> d89517735f54d9ced614cd882ac7c49599f3fb23 |
|
|||
| 96 | In [2]: x.upper() |
|
92 | In [2]: x.upper() | |
| 97 | Out[2]: 'HELLO WORLD' |
|
93 | Out[2]: 'HELLO WORLD' | |
| 98 |
|
94 | |||
General Comments 0
You need to be logged in to leave comments.
Login now