Projects >> httpcache4j >>ccdc581f7f9d3b683b03af7c474160d3a3d1594f

Chunk
Conflicting content
            return headers.iterator();
        }
    }
<<<<<<< HEAD
=======

    private static class Name implements Serializable {
        private static final long serialVersionUID = 429640405363982150L;
        private final String name;

        public Name(final String name) {
            this.name = name;
        }

        public String getName() {
            return name;
        }

        @Override
        public boolean equals(Object o) {
            if (this == o) {
                return true;
            }
            if (o == null || getClass() != o.getClass()) {
                return false;
            }

            Name name1 = (Name) o;

            return !(name != null ? !name.equalsIgnoreCase(name1.name) : name1.name != null);
        }

        @Override
        public int hashCode() {
            return name != null ? name.toLowerCase(Locale.ENGLISH).hashCode() : 0;
        }

        @Override
        public String toString() {
            return name;
        }
    }
>>>>>>> 24fa341f4fe3d819067b80de67bdf98e8861a8de
}
Solution content
            return headers.iterator();
        }
    }
}
File
Headers.java
Developer's decision
Version 1
Kind of conflict
Class declaration