adds new actions

Author: abhi1693

actions/get.dcim.cable_terminations.yaml

@@ -1,11 +1,6 @@
 # This action was auto generated from the NetBox API Swagger Spec
-<<<<<<<< HEAD:actions/get.dcim.cable_terminations.yaml
 # NetBox API version: 3.5
 description: "GET Cable Terminations"
-========
-# NetBox API version: 3.4
-description: "Retrieve a list of job results"
->>>>>>>> origin/master:actions/get.extras.job_results.yaml
 enabled: true
 entry_point: run.py
 name: get.dcim.cable_terminations
@@ -26,15 +21,11 @@ parameters:
     required: false
     type: string
     description: ""
-<<<<<<<< HEAD:actions/get.dcim.cable_terminations.yaml
   cable:
     required: false
     type: string
     description: ""
   cable_end:
-========
-  interval:
->>>>>>>> origin/master:actions/get.extras.job_results.yaml
     required: false
     type: string
     description: ""
@@ -46,54 +37,6 @@ parameters:
     required: false
     type: string
     description: ""
-  created:
-    required: false
-    type: string
-    description: ""
-  created__before:
-    required: false
-    type: string
-    description: ""
-  created__after:
-    required: false
-    type: string
-    description: ""
-  scheduled:
-    required: false
-    type: string
-    description: ""
-  scheduled__before:
-    required: false
-    type: string
-    description: ""
-  scheduled__after:
-    required: false
-    type: string
-    description: ""
-  started:
-    required: false
-    type: string
-    description: ""
-  started__before:
-    required: false
-    type: string
-    description: ""
-  started__after:
-    required: false
-    type: string
-    description: ""
-  completed:
-    required: false
-    type: string
-    description: ""
-  completed__before:
-    required: false
-    type: string
-    description: ""
-  completed__after:
-    required: false
-    type: string
-    description: ""
   id__n:
     required: false
     type: string
@@ -114,31 +57,7 @@ parameters:
     required: false
     type: string
     description: ""
-<<<<<<<< HEAD:actions/get.dcim.cable_terminations.yaml
   cable__n:
-========
-  interval__n:
-    required: false
-    type: string
-    description: ""
-  interval__lte:
-    required: false
-    type: string
-    description: ""
-  interval__lt:
-    required: false
-    type: string
-    description: ""
-  interval__gte:
-    required: false
-    type: string
-    description: ""
-  interval__gt:
-    required: false
-    type: string
-    description: ""
-  status__n:
->>>>>>>> origin/master:actions/get.extras.job_results.yaml
     required: false
     type: string
     description: ""
@@ -173,29 +92,6 @@ parameters:
   ordering:
     required: false
     type: string
-<<<<<<<< HEAD:actions/get.dcim.cable_terminations.yaml
-========
-    description: ""
-  name__nisw:
-    required: false
-    type: string
-    description: ""
-  name__ie:
-    required: false
-    type: string
-    description: ""
-  name__nie:
-    required: false
-    type: string
-    description: ""
-  name__empty:
-    required: false
-    type: string
-    description: ""
-  ordering:
-    required: false
-    type: string
->>>>>>>> origin/master:actions/get.extras.job_results.yaml
     description: "Which field to use when ordering the results."
   limit:
     required: false