Merge branch 'master' into next

[Sone.git] / src / main / java / net / pterodactylus / sone / text / PartContainer.java

diff --git a/src/main/java/net/pterodactylus/sone/text/PartContainer.java b/src/main/java/net/pterodactylus/sone/text/PartContainer.java
index 88c889e..e456cd9 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/text/PartContainer.java
+++ b/src/main/java/net/pterodactylus/sone/text/PartContainer.java
@@ -1,5 +1,5 @@
 /*
- * Sone - PartContainer.java - Copyright © 2010 David Roden
+ * Sone - PartContainer.java - Copyright © 2010–2012 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -107,7 +107,6 @@ public class PartContainer implements Part, Iterable<Part> {
                                }
                                noNextPart = true;
                                while (!partStack.isEmpty()) {
-                                       @SuppressWarnings("hiding")
                                        Iterator<Part> parts = partStack.pop();
                                        if (parts.hasNext()) {
                                                nextPart = parts.next();