Skip to content

Commit 841a5c7

Browse files
committed
fix save
1 parent cfa6c11 commit 841a5c7

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

‎pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,13 @@
159159
<dependency>
160160
<groupId>com.azure</groupId>
161161
<artifactId>azure-core</artifactId>
162-
<<<<<<< HEAD
163162
<version>${azure-core.version}</version>
164163
</dependency>
165164

166165
<dependency>
167166
<groupId>com.microsoft.kiota</groupId>
168167
<artifactId>microsoft-kiota-abstractions</artifactId>
169168
<version>${kiota.version}</version>
170-
=======
171-
<version>1.58.1</version>
172-
>>>>>>> origin/main
173169
</dependency>
174170
<dependency>
175171
<groupId>com.microsoft.kiota</groupId>

0 commit comments

Comments
 (0)