From 8fb48d37c009fc4cde0083dbb7f3d6c08a5a403e Mon Sep 17 00:00:00 2001
From: Dion Hulse <dd32@git.wordpress.org>
Date: Fri, 22 Jan 2010 07:23:14 +0000
Subject: [PATCH] Remove svn:ignore properties which were accidentally added in
 the merge. Props jamescollins. Fixes #11960

git-svn-id: https://develop.svn.wordpress.org/trunk@12793 602fd350-edb4-49c9-b593-d223f7449a82