diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-10-16 15:55:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-10-16 15:55:44 +0200 |
| commit | bcccdc71cb363760c6b0899fd13dee4203ec8711 (patch) | |
| tree | 28b9ff653a1b08ef45eb1ac14ce513496d3addb4 /drawinglayer | |
| parent | 0716aca251bbb64fab6c8697ee0a2215461f1019 (diff) | |
Fix merge conflict
between 0716aca251bbb64fab6c8697ee0a2215461f1019 "tscp: move getting the current
policy type to class. helper" on the one hand and
217dd15374a7020aa498817bcf4ea28157e7080f "TSCP: edit paragraph classification"
and c140d8d97344299be70e32ac4ebc324ba4dc5dba "TSCP: paragraph classification
support" on the other.
Change-Id: I9c399b0224c485d71e39ad547be2f9b51fbbecc9
Diffstat (limited to 'drawinglayer')
0 files changed, 0 insertions, 0 deletions