From b4a47d27855ea9d3da4ce1edb2c788b113f366b7 Mon Sep 17 00:00:00 2001
From: Ziad Sawalha <github@highbridgellc.com>
Date: Tue, 21 Jun 2011 22:20:54 -0500
Subject: Readme fix

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index 2788b8cb..40806197 100644
--- a/README.md
+++ b/README.md
@@ -28,9 +28,6 @@ documents the APIs to call and how to use them.
   <tr>
     <td>Role</td><td>A responsibility which is linked to a given user (and optionally scoped to a particular tenant).</td>
   </tr>
-  <tr>
-    <td>Group</td><td>A group of users. Group use cases are not yet defined in Keystone.</td>
-  </tr>
   <tr>
     <td>Token</td><td>A 'token' describes a temporary object obtained by clients from Keystone and used to identify themselves to an OpenStack service.</td>
   </tr>
@@ -204,13 +201,10 @@ in troubleshooting:
     # Get a token for a tenant
 
     $ curl -d '{"passwordCredentials": {"username": "joeuser", "password": "secrete", "tenantId": "1234"}}' -H "Content-type: application/json" http://localhost:8080/v2.0/tokens
-<<<<<<< HEAD
-=======
 
     # Get an admin token
 
     $ curl -d '{"passwordCredentials": {"username": "admin", "password": "secrete"}}' -H "Content-type: application/json" http://localhost:8081/v2.0/tokens
->>>>>>> c8de07620830c3d9f5bfb7c8d818a0440d1076c4
 </pre>
 
 #### Load Testing
-- 
cgit