Resolve merge conflicts with master

Discard changes from commit eeaf8e639c0157ded481b59f468754c88ee999e9

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --cc src/nitdoc.nit
index fef6e46,280e273..4a5e68e
--- 1/src/nitdoc.nit
--- 2/src/nitdoc.nit
+++ b/src/nitdoc.nit
@@@ -222,10 -223,7 +222,8 @@@ en
  # Nitdoc base page
  abstract class NitdocPage
  
-       var dot_dir: nullable String
-       var source: nullable String
        var ctx: NitdocContext
 +      var shareurl = "."
  
        init(ctx: NitdocContext) do
                self.ctx = ctx