aboutsummaryrefslogtreecommitdiff
path: root/gradle.properties
diff options
context:
space:
mode:
authorPandaNinjas <admin@malwarefight.gq>2023-05-19 17:19:06 -0400
committerPandaNinjas <admin@malwarefight.gq>2023-05-19 17:19:06 -0400
commitf6b449e65d050b321abf0e54826ec48c0d993b2a (patch)
tree33f0a244dd1a37ccf557c08b0ddb0f1677709ce5 /gradle.properties
parentd30a5775fab3f4e8968e4066a5e59a4b953d8870 (diff)
parentf1b1c43ba43f78c8cf86be2c32593131054af089 (diff)
downloadNoSession-f6b449e65d050b321abf0e54826ec48c0d993b2a.tar.gz
NoSession-f6b449e65d050b321abf0e54826ec48c0d993b2a.tar.bz2
NoSession-f6b449e65d050b321abf0e54826ec48c0d993b2a.zip
fix merge conflict
Diffstat (limited to 'gradle.properties')
0 files changed, 0 insertions, 0 deletions