Skip to content

Commit

Permalink
undo supression
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Gross cogross committed Nov 14, 2024
1 parent fdc7ca2 commit 2ab7d81
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,6 @@ private String[] getConfPrefixes(String type) {
* a different map of markings
* @return the merged markings
*/
@SuppressWarnings("unchecked")
protected Map<String,String> mergeMarkings(Map<String,String> markings1, Map<String,String> markings2) {
if (markings2 != null) {
if (markings1 == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,6 @@ private String[] getConfPrefixes(String type, String instance) {
* a different map of markings
* @return the merged markings
*/
@SuppressWarnings("unchecked")
protected Map<String,String> mergeMarkings(Map<String,String> markings1, Map<String,String> markings2) {
if (markings2 != null) {
if (markings1 == null) {
Expand Down

0 comments on commit 2ab7d81

Please sign in to comment.