resolve the merge conflicts

gefeili · gefeili · commit 913790c5abd4 · 2024-07-24T13:05:49.000+09:30
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/SignaturePacket.java b/pg/src/main/java/org/bouncycastle/bcpg/SignaturePacket.java
@@ -282,6 +282,7 @@ else if (p instanceof SignatureCreationTime)
 
         setIssuerKeyId();
         setCreationTime();
+        return vec;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -282,6 +282,7 @@ else if (p instanceof SignatureCreationTime)`
`282`	`282`
`283`	`283`	`setIssuerKeyId();`
`284`	`284`	`setCreationTime();`
	`285`	`+ return vec;`
`285`	`286`	`}`
`286`	`287`
`287`	`288`	`/**`