Correct merge conflict
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Sep 2018 07:47:30 +0000 (17:47 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Sep 2018 07:47:30 +0000 (17:47 +1000)
commit29fa45b695b3d851a33e76ff5904150f63c231b9
treeb2903e4ab57ca2ca713236a727d195d1a26fbc28
parent01e6f09001148313bb1658bad0c2d1341a7821cf
Correct merge conflict
release/scripts/startup/bl_ui/properties_grease_pencil_common.py