summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorAnatasof Wirapraja <anatasof.wirapraja@gmail.com>2019-08-31 12:30:14 +0700
committerAnatasof Wirapraja <anatasof.wirapraja@gmail.com>2019-08-31 12:30:14 +0700
commitc178a3745bb846c7de0a7e0ec6e5e5dbda849fc5 (patch)
tree6318848d40dcfc21ba45cdff950dbd2e6c9ab385 /.gitmodules
parent5ae553405369ad61678bd5596e3264b595109fcd (diff)
remove unnecessary lines after merge conflict
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions