resolve eroor merge
authorAndrea-Paz <gamberucci.andrea@gmail.com>
Wed, 17 Jul 2019 18:30:26 +0000 (20:30 +0200)
committerAndrea-Paz <gamberucci.andrea@gmail.com>
Wed, 17 Jul 2019 18:30:26 +0000 (20:30 +0200)
commit7cbe8842a2d2dbd5eae730c4ed0205e520c50409
treea40bb682f20d7716b1d553bd3aaa03bc8cbfee34
parentfca023184d698a003c95ee4c14da4a5d0fa63bde
parent0acc9b4eb418e04d2601a247a1336e52aecb47c5
resolve eroor merge
parts/Plugins.tex