8000 removing merge text · SnarkyPapi/server-client-python@45c63eb · GitHub
[go: up one dir, main page]
Skip to content

Commit 45c63eb

Browse files
d45d45
authored
removing merge text
Merge comments were added when content was updated on master.
1 parent 9b974e1 commit 45c63eb

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

‎docs/versions.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,9 @@ import tableauserverclient as TSC
3232

3333
server = TSC.Server('http://SERVER_URL')
3434

35-
<<<<<<< HEAD
36-
server.version = 2.4
37-
=======
3835

3936
server.version = '2.6'
4037

41-
42-
43-
>>>>>>> 87acd20... Update versions.md (#195)
4438
```
4539

4640
## Supported versions

0 commit comments

Comments
 (0)
0