summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-06-04 08:18:18 +0200
committerPierre Schmitz <pierre@archlinux.de>2015-06-04 08:18:18 +0200
commita72fd280f7acb4d2a1ba579a0f1b2b2ae8958530 (patch)
tree5f9304028b45e74fd0609203c19c53b70daecd11
parentf6d65e533c62f6deb21342d4901ece24497b433e (diff)
Remove left over from merge
-rw-r--r--.gitignore2
-rw-r--r--README.mediawiki.rej37
2 files changed, 2 insertions, 37 deletions
diff --git a/.gitignore b/.gitignore
index ead387eb..c8d614a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
.svn
*~
+*.orig
+*.rej
*.kate-swp
.classpath
.idea
diff --git a/README.mediawiki.rej b/README.mediawiki.rej
deleted file mode 100644
index 44c95ec4..00000000
--- a/README.mediawiki.rej
+++ /dev/null
@@ -1,37 +0,0 @@
---- README.mediawiki 2015-03-31 20:45:34.000000000 +0200
-+++ README.mediawiki 2015-05-25 22:59:46.000000000 +0200
-@@ -1,17 +1,17 @@
- == MediaWiki ==
-
--MediaWiki is a popular and free, open-source wiki software package written in
--PHP. It serves as the platform for Wikipedia and the other projects of the Wikimedia
--Foundation, which deliver content in over 280 languages to more than half a billion
--people each month. MediaWiki's reliability and robust feature set have earned it a
--large and vibrant community of third-party users and developers.
-+MediaWiki is a free and open-source wiki software package written in PHP. It
-+serves as the platform for Wikipedia and the other projects of the Wikimedia
-+Foundation, which deliver content in over 280 languages to more than half a
-+billion people each month. MediaWiki's reliability and robust feature set have
-+earned it a large and vibrant community of third-party users and developers.
-
- MediaWiki is:
-
--* feature-rich and extensible, both on-wiki and with over 2,000 extensions;
-+* feature-rich and extensible, both on-wiki and with hundreds of extensions;
- * scalable and suitable for both small and large sites;
--* available in your language; and
--* simple to install, working on most hardware/software combinations.
-+* simple to install, working on most hardware/software combinations; and
-+* available in your language.
-
- For system requirements, installation, and upgrade details, see the files
- RELEASE-NOTES, INSTALL, and UPGRADE.
-@@ -23,7 +23,7 @@
- * Seeking help from a person?
- ** https://www.mediawiki.org/wiki/Communication
- * Looking to file a bug report or a feature request?
--** https://bugzilla.wikimedia.org/
-+** https://bugs.mediawiki.org/
- * Interested in helping out?
- ** https://www.mediawiki.org/wiki/How_to_contribute
-