From 2671086d638aa2c51feb71100901c43d02be82aa Mon Sep 17 00:00:00 2001
From: "Jared Koumentis (ShepBook)" <jared@github.com>
Date: Thu, 4 Oct 2012 20:30:20 -0400
Subject: [PATCH] attempting to merge
 https://github.com/github/gitignore/pull/310

---
 Wordpress.gitignore | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/Wordpress.gitignore b/Wordpress.gitignore
index f40d4fd4..ffc36524 100644
--- a/Wordpress.gitignore
+++ b/Wordpress.gitignore
@@ -1,19 +1,14 @@
 .htaccess
-wp-*.php
-xmlrpc.php
-wp-admin/
-wp-includes/
+wp-config.php
 wp-content/uploads/
 wp-content/blogs.dir/
-wp-content/upgrade/*
-wp-content/backup-db/*
+wp-content/upgrade/
+wp-content/backup-db/
 wp-content/advanced-cache.php
 wp-content/wp-cache-config.php
-wp-content/cache/*
-wp-content/cache/supercache/*
-wp-content/w3tc/*
 sitemap.xml
-sitemap.xml.gz
-readme.html
-license.txt
 *.log
+wp-content/cache/
+wp-content/backups/
+sitemap.xml
+sitemap.xml.gz
\ No newline at end of file