Draft: Resolve "(TID) New service type for PON Controller"
Compare changes
Files
36
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 11
− 2
@@ -17,6 +17,7 @@ package context;
@@ -226,6 +227,7 @@ enum DeviceDriverEnum {
@@ -321,6 +323,7 @@ enum ServiceTypeEnum {
@@ -533,11 +536,17 @@ message ConfigRule_ACL {