GH-173 merge conflicts.

pcorless · May 8, 2023 · 6631532 · 6631532
1 parent 4b8a511
commit 6631532
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/MarkupGlueAnnotation.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/MarkupGlueAnnotation.java
@@ -9,19 +9,18 @@
 import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
-import java.util.HashMap;
 
 public class MarkupGlueAnnotation extends Annotation {
 
  protected MarkupAnnotation markupAnnotation;
  protected PopupAnnotation popupAnnotation;
 
- public MarkupGlueAnnotation(Library l, HashMap h) {
+ public MarkupGlueAnnotation(Library l, DictionaryEntries h) {
  super(l, h);
  }
 
  public MarkupGlueAnnotation(Library l, MarkupAnnotation markupAnnotation, PopupAnnotation popupAnnotation) {
- super(l, new HashMap());
+ super(l, new DictionaryEntries());
  this.markupAnnotation = markupAnnotation;
  this.popupAnnotation = popupAnnotation;
  }