vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(conflict)

Browse source
This commit is contained in:
Rushabh Mehta 2020-12-24 15:16:28 +05:30
parent ec2b3c5b18
commit bfde4c2c4c
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/core/doctype/user/user.json
View file

@ -657,11 +657,7 @@
}
],
"max_attachments": 5,
<<<<<<< HEAD
"modified": "2020-12-24 19:48:49.677800",
=======
"modified": "2020-12-23 12:43:51.470188",
>>>>>>> bfdf108343 (fix(minor): fix link in User doctype)
"modified_by": "Administrator",
"module": "Core",
"name": "User",