Resolved conflict.

This commit is contained in:
Kristofer Hallin 2021-11-09 08:53:47 +01:00
commit 9ce20ea449
No known key found for this signature in database
GPG key ID: 5A2B21943DE5C500
17 changed files with 310 additions and 40 deletions

View file

@ -77,6 +77,7 @@ enum genmodel_type{
GT_VARS, /* Keywords on non-key variables */
GT_ALL, /* Keywords on all variables */
GT_HIDE, /* Keywords on all variables and hide container around lists */
GT_OC_COMPRESS, /* OpenConfig */
};
typedef enum genmodel_type genmodel_type;