Skip to content

Commit 373148e

Browse files
committed
resolve merge conflict
1 parent b090dd8 commit 373148e

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

fern/fern.config.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
{
22
"organization": "assemblyai",
3-
<<<<<<< Updated upstream
4-
"version": "0.29.0"
5-
}
6-
=======
73
"version": "0.30.8-rc4"
84
}
9-
>>>>>>> Stashed changes

0 commit comments

Comments
 (0)