resolve conflict

andrechristikan · andrechristikan · commit 1d787bf4cdae · 2023-01-12T13:35:27.000+07:00
diff --git a/README.md b/README.md
@@ -7,3 +7,8 @@ Fork from [ack-nestjs-boilerplate](https://github.com/andrechristikan/ack-nestjs
 ## Instructions
 
 Before run, you must to create the topics with `kafka-topics cli`. Or you can run `yarn kafka:create-topics`.
+
+
+## Next
+
+- [ ] Kafka Transaction
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ack-nestjs-boilerplate-kafka",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "description": "Ack NestJs Boilerplate Kafka",
   "repository": {
     "type": "git",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ack-nestjs-boilerplate-kafka",`
`3`		`- "version": "3.2.4",`
	`3`	`+ "version": "3.2.5",`
`4`	`4`	`"description": "Ack NestJs Boilerplate Kafka",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`