Add conflicts for category changes

Authored by Mooeypoo on Mar 20 2017, 10:54 PM.

Description

Add conflicts for category changes

Bug: T160803
Change-Id: Icdab6d3c2c45a9d4089d9fd09e5072589ac5e182

Details

Committed
MooeypooMar 20 2017, 11:10 PM
Parents
rEORSbb3c01f266f8: build: Update stylelint to 0.4.1
Branches
Unknown
Tags
Unknown
References
refs/changes/83/343783/2
ChangeId
Icdab6d3c2c45a9d4089d9fd09e5072589ac5e182