Packet mod fixes

sdrbase/resources/webapi/doc/html2/index.html

@@ -2138,13 +2138,11 @@ margin-bottom: 20px;
     "FileSourceActions" : {
       "$ref" : "#/definitions/FileSourceActions"
     },
-<<<<<<< ours
     "SigMFFileSinkActions" : {
       "$ref" : "#/definitions/SigMFFileSinkActions"
-=======
+    },
     "PacketModActions" : {
       "$ref" : "#/definitions/PacketModActions"
->>>>>>> theirs
     }
   },
   "description" : "Base channel actions. Only the channel actions corresponding to the channel specified in the channelType field is or should be present."
@@ -43965,11 +43963,7 @@ except ApiException as e:
           </div>
           <div id="generator">
             <div class="content">
-<<<<<<< ours
-              Generated 2020-09-26T06:05:51.286+02:00
-=======
-              Generated 2020-09-18T15:59:26.503+02:00
->>>>>>> theirs
+              Generated 2020-09-28T02:05:09.647+02:00
             </div>
           </div>
       </div>