From 40a3b09cd1dfc0b9ed8cf5a0a1d7c6abd3990a4c Mon Sep 17 00:00:00 2001
From: Kyle Rames <kyle.rames@rackspace.com>
Date: Fri, 18 Oct 2013 11:17:42 -0500
Subject: [PATCH] [rackspace|block_storage] fixing merge issue

---
 lib/fog/rackspace/block_storage.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/fog/rackspace/block_storage.rb b/lib/fog/rackspace/block_storage.rb
index 2d894735f..f0e15dda1 100644
--- a/lib/fog/rackspace/block_storage.rb
+++ b/lib/fog/rackspace/block_storage.rb
@@ -26,8 +26,6 @@ module Fog
 
       model :volume_type
       collection :volume_types
-      model :snapshot
-      collection :snapshots
 
       model :snapshot
       collection :snapshots