Permalink
Browse files

Fix merge conflict

  • Loading branch information...
1 parent b7fb6ba commit 7708d07776964f8a300205d1ee1e54f45b402aa2 @joshbetz joshbetz committed Aug 3, 2012
Showing with 1 addition and 7 deletions.
  1. +1 −7 README.md
View
@@ -6,13 +6,7 @@ A WordPress plugin that lets you manage users across all your sites from one pla
Filters
-----
-<<<<<<< HEAD
-* `bulk_user_management_blogs` - array of blogs to limit against.
-* `bulk_user_management_parent_page` - sets parent page.
-* `bulk_user_management_admin_users` - array of users that the plugin is active for
-=======
* `bulk_user_management_blogs` - array of sites that can be managed
* `bulk_user_management_parent_page` - sets parent page
* `bulk_user_management_admin_users` - array of users by id that the plugin is active for
-* `bulk_user_management_admins_by_username` - array of users by username that the plugin is active for
->>>>>>> develop
+* `bulk_user_management_admins_by_username` - array of users by username that the plugin is active for

0 comments on commit 7708d07

Please sign in to comment.