deblan-mirror/24eme-signaturepdf
1
0
Fork 0
mirror of https://github.com/24eme/signaturepdf synced 2024-05-21 07:06:41 +02:00
Code Activity

Bad merge

Browse source
This commit is contained in:
Vincent LAURENT 2023-10-30 16:31:23 +01:00 committed by GitHub
parent 8c998a7290
commit f650e38946
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -170,9 +170,6 @@ Vincent LAURENT (24ème), Jean-Baptiste Le Metayer (24ème), Xavier Garnier (Log
- 100 € excl. taxes donations from the company PDG IT
- 1 040 € excl. taxes from the foundation NLNet pour software internationalization
<<<<<<< HEAD
The development of the software was primarily done during the working hours of 24ème employees.
=======
The development of the software was primarily done during the working hours of 24ème employees.
## Screenshots
@ -198,4 +195,3 @@ The development of the software was primarily done during the working hours of 2
### Compression feature
![image](https://github.com/24eme/signaturepdf/assets/71143205/7d0e93a3-5567-4545-9c43-033b9028b036)
>>>>>>> 6f677d88b834018412ab55101942c97b3213743b