aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base/trait.py
diff options
context:
space:
mode:
authorAlexanderlacuna2020-10-29 16:07:52 +0300
committerAlexanderlacuna2020-10-29 16:07:52 +0300
commit18304a9b20bd4180b40be8296df26c2a0acf62fa (patch)
treee6e981b3c1b5942689d7b09faef4139d48605918 /wqflask/base/trait.py
parenta7c4affd6b50b00ab8801b6daa96b07e88034209 (diff)
downloadgenenetwork2-18304a9b20bd4180b40be8296df26c2a0acf62fa.tar.gz
resolve merge conflict
Diffstat (limited to 'wqflask/base/trait.py')
0 files changed, 0 insertions, 0 deletions