From ab4ebd19d9759b26bfb6004611dcca81107dd651 Mon Sep 17 00:00:00 2001
From: zhupengfei <zhupengfeivip@163.com>
Date: Mon, 1 Nov 2021 13:43:05 +0800
Subject: [PATCH] fix

---
 TypeScript/snowflakeIdv1.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/TypeScript/snowflakeIdv1.ts b/TypeScript/snowflakeIdv1.ts
index 9eb8387..0d4f75f 100644
--- a/TypeScript/snowflakeIdv1.ts
+++ b/TypeScript/snowflakeIdv1.ts
@@ -372,11 +372,7 @@ export class snowflakeIdv1 {
      * 生成ID
      * @returns 始终输出bigint类型
      */
-<<<<<<< HEAD
     public NextBigId(): bigint {
-=======
-    public NextId(): bigint {
->>>>>>> 91459b1538b24a03174b20eba10db410d8ef5268
         if (this._IsOverCost) {
             //
             return this.NextOverCostId()
-- 
GitLab