From f6c28711282da5247b77673fcc9341c807283876 Mon Sep 17 00:00:00 2001 From: lucamauri Date: Wed, 17 Jun 2020 00:29:50 +0200 Subject: [PATCH] Readme updated --- README.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/README.md b/README.md index 802233e..5ad7610 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,7 @@ It was originally conceived and written by [Luca Mauri](https://github.com/lucam Easiest way to install the extension is using _Composer_: it will automatically resolve all the dependencies and install them as well. -<<<<<<< HEAD -Easiest way to install the extension is using _Composer_: it will automatically resolve all the dependencies and install them as well. - -======= - -> > > > > > > e9dc6a179d3d3a66278b64110221fd9d87ac2c95 -> > > > > > > Add the `require` configuration as in the following example to the `composer.local.json` at the root of your mediawiki installation, or create the file if it does not exist yet: +Add the `require` configuration as in the following example to the `composer.local.json` at the root of your mediawiki installation, or create the file if it does not exist yet: ```JSON { @@ -88,19 +82,10 @@ An optional keyword to check into the page. When present, P2G will _not_ upload ### \$wgP2GAddKeyword -<<<<<<< HEAD - An optional boolean parameter: when set to `true` the word defined in _\$wgP2GKeyword_ is added before the name of the page to form the filename. ### \$wgP2GNameSpace -======= -An optional boolean parameter: when set to `true` the word defined in _\$wgP2GKeyword_ is added before the name of the page to form the filename. - -> > > > > > > e9dc6a179d3d3a66278b64110221fd9d87ac2c95 - -### \$wgP2GNameSpace - P2G will upload pages only belonging to the namespace spedified in this variable ### \$wgP2GOwner