resolve conflict

This commit is contained in:
Xuan Sang LE
2021-02-10 21:06:59 +01:00

View File

@ -5,8 +5,9 @@ It needs to connect to a working OnlyOffice document server.
The application allows to open/edit commons document, presentation, and spreedsheet. The application allows to open/edit commons document, presentation, and spreedsheet.
Integrate OnlyOffice to an virtual window environment like AntOs allows an inconvenient Integrate OnlyOffice to an virtual window environment like AntOs allows an inconvenient
way to work with multiple document at the same time way to work with multiple documents at the same time.
![https://github.com/lxsang/antosdk-apps/blob/master/OnlyOffice/screenshot.png?raw=true](https://github.com/lxsang/antosdk-apps/blob/master/OnlyOffice/screenshot.png?raw=true)
## Change log ## Change log
- v 0.1.1a: generate document key based on username and file path - v 0.1.1a: generate document key based on username and file path