Actually resolve conflicts

hns · Aug 7, 2024 · ffd4ecc · ffd4ecc
1 parent 1669944
commit ffd4ecc
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassWriter.java
@@ -156,11 +156,7 @@ protected void buildClassTree(Content classContent) {
      * @param target the content to which the documentation will be added
      */
     protected void buildClassInfo(Content target) {
-<<<<<<< HEAD
         var c = new ContentBuilder();
-=======
-        Content c = HtmlTree.DIV(HtmlStyles.horizontalScroll);
->>>>>>> master
         buildParamInfo(c);
         buildSuperInterfacesInfo(c);
         buildImplementedInterfacesInfo(c);
@@ -169,8 +165,8 @@ protected void buildClassInfo(Content target) {
         buildInterfaceUsageInfo(c);
         buildNestedClassInfo(c);
         buildFunctionalInterfaceInfo(c);
-        c.add(new HtmlTree(TagName.HR));
-        var div = HtmlTree.DIV(HtmlStyle.horizontalScroll);
+        c.add(new HtmlTree(HtmlTag.HR));
+        var div = HtmlTree.DIV(HtmlStyles.horizontalScroll);
         buildClassSignature(div);
         buildDeprecationInfo(div);
         buildClassDescription(div);
@@ -506,10 +502,6 @@ public TypeElement getCurrentPageElement() {
     }
 
     protected void addClassSignature(Content classInfo) {
-<<<<<<< HEAD
-=======
-        classInfo.add(new HtmlTree(HtmlTag.HR));
->>>>>>> master
         classInfo.add(new Signatures.TypeSignature(typeElement, this)
                 .toContent());
     }