fix_merge_conflict_06_04_26

averbn · averbn · commit cb7b392b4675 · 2026-04-06T11:20:10.000+02:00
diff --git a/Solutions/SOC Prime CCF/Package/mainTemplate.json b/Solutions/SOC Prime CCF/Package/mainTemplate.json
@@ -679,7 +679,6 @@
                 ],
                 "entityMappings": [
                   {
-<<<<<<< HEAD
                     "entityType": "Account",
                     "fieldMappings": [
                       {
@@ -696,24 +695,6 @@
                         "columnName": "SourceIp"
                       }
                     ]
-=======
-                    "fieldMappings": [
-                      {
-                        "columnName": "UserName",
-                        "identifier": "Name"
-                      }
-                    ],
-                    "entityType": "Account"
-                  },
-                  {
-                    "fieldMappings": [
-                      {
-                        "columnName": "SourceIp",
-                        "identifier": "Address"
-                      }
-                    ],
-                    "entityType": "IP"
->>>>>>> 287dcdcbef60122458f43a6bd20b909f8347ea41
                   }
                 ]
               }
@@ -814,7 +795,6 @@
                 ],
                 "entityMappings": [
                   {
-<<<<<<< HEAD
                     "entityType": "Account",
                     "fieldMappings": [
                       {
@@ -831,24 +811,6 @@
                         "columnName": "SourceIp"
                       }
                     ]
-=======
-                    "fieldMappings": [
-                      {
-                        "columnName": "UserName",
-                        "identifier": "Name"
-                      }
-                    ],
-                    "entityType": "Account"
-                  },
-                  {
-                    "fieldMappings": [
-                      {
-                        "columnName": "SourceIp",
-                        "identifier": "Address"
-                      }
-                    ],
-                    "entityType": "IP"
->>>>>>> 287dcdcbef60122458f43a6bd20b909f8347ea41
                   }
                 ]
               }
@@ -946,7 +908,6 @@
                 ],
                 "entityMappings": [
                   {
-<<<<<<< HEAD
                     "entityType": "Account",
                     "fieldMappings": [
                       {
@@ -963,24 +924,6 @@
                         "columnName": "SourceIp"
                       }
                     ]
-=======
-                    "fieldMappings": [
-                      {
-                        "columnName": "UserName",
-                        "identifier": "Name"
-                      }
-                    ],
-                    "entityType": "Account"
-                  },
-                  {
-                    "fieldMappings": [
-                      {
-                        "columnName": "SourceIp",
-                        "identifier": "Address"
-                      }
-                    ],
-                    "entityType": "IP"
->>>>>>> 287dcdcbef60122458f43a6bd20b909f8347ea41
                   }
                 ]
               }

Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,6 @@`
`679`	`679`	`],`
`680`	`680`	`"entityMappings": [`
`681`	`681`	`{`
`682`		`-<<<<<<< HEAD`
`683`	`682`	`"entityType": "Account",`
`684`	`683`	`"fieldMappings": [`
`685`	`684`	`{`
`@@ -696,24 +695,6 @@`
`696`	`695`	`"columnName": "SourceIp"`
`697`	`696`	`}`
`698`	`697`	`]`
`699`		`-=======`
`700`		`- "fieldMappings": [`
`701`		`- {`
`702`		`- "columnName": "UserName",`
`703`		`- "identifier": "Name"`
`704`		`- }`
`705`		`- ],`
`706`		`- "entityType": "Account"`
`707`		`- },`
`708`		`- {`
`709`		`- "fieldMappings": [`
`710`		`- {`
`711`		`- "columnName": "SourceIp",`
`712`		`- "identifier": "Address"`
`713`		`- }`
`714`		`- ],`
`715`		`- "entityType": "IP"`
`716`		`->>>>>>> 287dcdcbef60122458f43a6bd20b909f8347ea41`
`717`	`698`	`}`
`718`	`699`	`]`
`719`	`700`	`}`
`@@ -814,7 +795,6 @@`
`814`	`795`	`],`
`815`	`796`	`"entityMappings": [`
`816`	`797`	`{`
`817`		`-<<<<<<< HEAD`
`818`	`798`	`"entityType": "Account",`
`819`	`799`	`"fieldMappings": [`
`820`	`800`	`{`
`@@ -831,24 +811,6 @@`
`831`	`811`	`"columnName": "SourceIp"`
`832`	`812`	`}`
`833`	`813`	`]`
`834`		`-=======`
`835`		`- "fieldMappings": [`
`836`		`- {`
`837`		`- "columnName": "UserName",`
`838`		`- "identifier": "Name"`
`839`		`- }`
`840`		`- ],`
`841`		`- "entityType": "Account"`
`842`		`- },`
`843`		`- {`
`844`		`- "fieldMappings": [`
`845`		`- {`
`846`		`- "columnName": "SourceIp",`
`847`		`- "identifier": "Address"`
`848`		`- }`
`849`		`- ],`
`850`		`- "entityType": "IP"`
`851`		`->>>>>>> 287dcdcbef60122458f43a6bd20b909f8347ea41`
`852`	`814`	`}`
`853`	`815`	`]`
`854`	`816`	`}`
`@@ -946,7 +908,6 @@`
`946`	`908`	`],`
`947`	`909`	`"entityMappings": [`
`948`	`910`	`{`
`949`		`-<<<<<<< HEAD`
`950`	`911`	`"entityType": "Account",`
`951`	`912`	`"fieldMappings": [`
`952`	`913`	`{`
`@@ -963,24 +924,6 @@`
`963`	`924`	`"columnName": "SourceIp"`
`964`	`925`	`}`
`965`	`926`	`]`
`966`		`-=======`
`967`		`- "fieldMappings": [`
`968`		`- {`
`969`		`- "columnName": "UserName",`
`970`		`- "identifier": "Name"`
`971`		`- }`
`972`		`- ],`
`973`		`- "entityType": "Account"`
`974`		`- },`
`975`		`- {`
`976`		`- "fieldMappings": [`
`977`		`- {`
`978`		`- "columnName": "SourceIp",`
`979`		`- "identifier": "Address"`
`980`		`- }`
`981`		`- ],`
`982`		`- "entityType": "IP"`
`983`		`->>>>>>> 287dcdcbef60122458f43a6bd20b909f8347ea41`
`984`	`927`	`}`
`985`	`928`	`]`
`986`	`929`	`}`