12. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2020-08-17 08:36:36 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

12.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Porto v3.2.4/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Socialfeeds/etc/adminhtmlsystem.xml2017-05-02 17:14:24 +0000
2/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Socialfeeds/etc/adminhtmlsystem.xml2020-08-16 10:56:04 +0000

12.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged2666
Changed128
Inserted00
Removed00

12.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

12.4 Active regular expressions

No regular expressions were active.

12.5 Comparison detail

1 <?xml  1 <?xml 
2  version="1.0" 2  version="1.0"
3 ?> 3 ?>
4 <config  4 <config 
5  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  5  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
6  xsi:noNamespaceSchemaLocation="../../../../Magento/Backend/etc/system_file.xsd" 6  xsi:noNamespaceSchemaLocation="../../../../Magento/Backend/etc/system_file.xsd"
7 > 7 >
8       8      
9  <system> 9  <system>
10            10           
11   <section  11   <section 
12    id="sw_socialfeeds"  12    id="sw_socialfeeds" 
13    translate="label"  13    translate="label" 
14    type="text 14    type="text
15    sortOrder="40"  15    sortOrder="40" 
16    showInDefault="1"  16    showInDefault="1" 
17    showInWebsite="1"  17    showInWebsite="1" 
18    showInStore="1" 18    showInStore="1"
19   > 19   >
20                 20                
21    <class> 21    <class>
22     separator-top 22     separator-top
23    </class> 23    </class>
24                 24                
25    <label> 25    <label>
26     Social Feeds 26     Social Feeds
27    </label> 27    </label>
28                 28                
29    <tab> 29    <tab>
30     sw_extensions 30     sw_extensions
31    </tab> 31    </tab>
32                 32                
33    <resource> 33    <resource>
34     Smartwave_Socialfeeds::config_socialfeeds 34     Smartwave_Socialfeeds::config_socialfeeds
35    </resource> 35    </resource>
36                 36                
37    <group  37    <group 
38     id="facebook_fanbox"  38     id="facebook_fanbox" 
39     translate="label"  39     translate="label" 
40     type="text 40     type="text
41     sortOrder="20"  41     sortOrder="20" 
42     showInDefault="1"  42     showInDefault="1" 
43     showInWebsite="1"  43     showInWebsite="1" 
44     showInStore="1" 44     showInStore="1"
45    > 45    >
46                      46                     
47     <label> 47     <label>
48      Facebook Fanbox 48      Facebook Fanbox
49     </label> 49     </label>
50                      50                     
51     <field  51     <field 
52      id="enable 52      id="enable
53      translate="label"  53      translate="label" 
54      type="select"  54      type="select" 
55      sortOrder="10"  55      sortOrder="10" 
56      showInDefault="1"  56      showInDefault="1" 
57      showInWebsite="1"  57      showInWebsite="1" 
58      showInStore="1" 58      showInStore="1"
59     > 59     >
60                           60                          
61      <label> 61      <label>
62       Enable 62       Enable
63      </label> 63      </label>
64                           64                          
65      <source_model> 65      <source_model>
66       Magento\Config\Model\Config\Source\Yesno 66       Magento\Config\Model\Config\Source\Yesno
67      </source_model> 67      </source_model>
68                       68                      
69     </field> 69     </field>
70                      70                     
71     <field  71     <field 
72      id="facebook_name"  72      id="facebook_name" 
73      translate="label comment"  73      translate="label comment" 
74      type="text 74      type="text
75      sortOrder="30"  75      sortOrder="30" 
76      showInDefault="1"  76      showInDefault="1" 
77      showInWebsite="1"  77      showInWebsite="1" 
78      showInStore="1" 78      showInStore="1"
79     > 79     >
80                           80                          
81      <label> 81      <label>
82       Facebook Name 82       Facebook Name
83      </label> 83      </label>
84                           84                          
85      <depends> 85      <depends>
86                                86                               
87       <field  87       <field 
88        id="enable" 88        id="enable"
89       > 89       >
90        1 90        1
91       </field> 91       </field>
92                            92                           
93      </depends> 93      </depends>
94                       94                      
95     </field> 95     </field>
96                      96                     
97     <field  97     <field 
98      id="showing_counts"  98      id="showing_counts" 
99      translate="label comment"  99      translate="label comment" 
100      type="text 100      type="text
101      sortOrder="40"  101      sortOrder="40" 
102      showInDefault="1"  102      showInDefault="1" 
103      showInWebsite="1"  103      showInWebsite="1" 
104      showInStore="1" 104      showInStore="1"
105     > 105     >
106                           106                          
107      <label> 107      <label>
108       Showing Counts 108       Showing Counts
109      </label> 109      </label>
110                           110                          
111      <depends> 111      <depends>
112                                112                               
113       <field  113       <field 
114        id="enable" 114        id="enable"
115       > 115       >
116        1 116        1
117       </field> 117       </field>
118                            118                           
119      </depends> 119      </depends>
120                       120                      
121     </field> 121     </field>
122                  122                 
123    </group> 123    </group>
124                 124                
125    <group  125    <group 
126     id="flickr_photos"  126     id="flickr_photos" 
127     translate="label"  127     translate="label" 
128     type="text 128     type="text
129     sortOrder="40"  129     sortOrder="40" 
130     showInDefault="1"  130     showInDefault="1" 
131     showInWebsite="1"  131     showInWebsite="1" 
132     showInStore="1" 132     showInStore="1"
133    > 133    >
134                      134                     
135     <label> 135     <label>
136      Flickr Photos 136      Flickr Photos
137     </label> 137     </label>
138                      138                     
139     <field  139     <field 
140      id="enable 140      id="enable
141      translate="label"  141      translate="label" 
142      type="select"  142      type="select" 
143      sortOrder="10"  143      sortOrder="10" 
144      showInDefault="1"  144      showInDefault="1" 
145      showInWebsite="1"  145      showInWebsite="1" 
146      showInStore="1" 146      showInStore="1"
147     > 147     >
148                           148                          
149      <label> 149      <label>
150       Enable 150       Enable
151      </label> 151      </label>
152                           152                          
153      <source_model> 153      <source_model>
154       Magento\Config\Model\Config\Source\Yesno 154       Magento\Config\Model\Config\Source\Yesno
155      </source_model> 155      </source_model>
156                       156                      
157     </field> 157     </field>
158                      158                     
159     <field  159     <field 
160      id="api_key"  160      id="api_key" 
161      translate="label comment"  161      translate="label comment" 
162      type="text 162      type="text
163      sortOrder="30"  163      sortOrder="30" 
164      showInDefault="1"  164      showInDefault="1" 
165      showInWebsite="1"  165      showInWebsite="1" 
166      showInStore="1" 166      showInStore="1"
167     > 167     >
168                           168                          
169      <label> 169      <label>
170       API Key 170       API Key
171      </label> 171      </label>
172                           172                          
173      <comment> 173      <comment>
174       <![CDATA[Go to <a href="http://www.flickr.com/services/api/key.gne" target="_blank">http://www.flickr.com/services/api/key.gne</a> to get API Key]]> 174       <![CDATA[Go to <a href="http://www.flickr.com/services/api/key.gne" target="_blank">http://www.flickr.com/services/api/key.gne</a> to get API Key]]>
175      </comment> 175      </comment>
176                           176                          
177      <depends> 177      <depends>
178                                178                               
179       <field  179       <field 
180        id="enable" 180        id="enable"
181       > 181       >
182        1 182        1
183       </field> 183       </field>
184                            184                           
185      </depends> 185      </depends>
186                       186                      
187     </field> 187     </field>
188                      188                     
189     <field  189     <field 
190      id="photo_set_id"  190      id="photo_set_id" 
191      translate="label comment"  191      translate="label comment" 
192      type="text 192      type="text
193      sortOrder="40"  193      sortOrder="40" 
194      showInDefault="1"  194      showInDefault="1" 
195      showInWebsite="1"  195      showInWebsite="1" 
196      showInStore="1" 196      showInStore="1"
197     > 197     >
198                           198                          
199      <label> 199      <label>
200       Photo Set Id 200       Photo Set Id
201      </label> 201      </label>
202                           202                          
203      <depends> 203      <depends>
204                                204                               
205       <field  205       <field 
206        id="enable" 206        id="enable"
207       > 207       >
208        1 208        1
209       </field> 209       </field>
210                            210                           
211      </depends> 211      </depends>
212                       212                      
213     </field> 213     </field>
214                      214                     
215     <field  215     <field 
216      id="showing_counts"  216      id="showing_counts" 
217      translate="label comment"  217      translate="label comment" 
218      type="text 218      type="text
219      sortOrder="50"  219      sortOrder="50" 
220      showInDefault="1"  220      showInDefault="1" 
221      showInWebsite="1"  221      showInWebsite="1" 
222      showInStore="1" 222      showInStore="1"
223     > 223     >
224                           224                          
225      <label> 225      <label>
226       Showing Counts 226       Showing Counts
227      </label> 227      </label>
228                           228                          
229      <depends> 229      <depends>
230                                230                               
231       <field  231       <field 
232        id="enable" 232        id="enable"
233       > 233       >
234        1 234        1
235       </field> 235       </field>
236                            236                           
237      </depends> 237      </depends>
238                       238                      
239     </field> 239     </field>
240                  240                 
241    </group> 241    </group>
242                 242                
243    <group  243    <group 
244     id="instagram_photos 244     id="instagram_photos
245     translate="label"  245     translate="label" 
246     type="text 246     type="text
247     sortOrder="45"  247     sortOrder="45" 
248     showInDefault="1"  248     showInDefault="1" 
249     showInWebsite="1"  249     showInWebsite="1" 
250     showInStore="1" 250     showInStore="1"
251    > 251    >
252                      252                     
253     <label> 253     <label>
254      Instagram Photos 254      Instagram Photos
255     </label> 255     </label>
256                      256                     
257     <field  257     <field 
258      id="enable 258      id="enable
259      translate="label"  259      translate="label" 
260      type="select"  260      type="select" 
261      sortOrder="10"  261      sortOrder="10" 
262      showInDefault="1"  262      showInDefault="1" 
263      showInWebsite="1"  263      showInWebsite="1" 
264      showInStore="1" 264      showInStore="1"
265     > 265     >
266                           266                          
267      <label> 267      <label>
268       Enable 268       Enable
269      </label> 269      </label>
270                           270                          
271      <source_model> 271      <source_model>
272       Magento\Config\Model\Config\Source\Yesno 272       Magento\Config\Model\Config\Source\Yesno
273      </source_model> 273      </source_model>
274                       274                      
275     </field> 275     </field>
276                      276                     
277     <field  277     <field 
278      id="accesstocken"  278      id="accesstocken" 
279      translate="label comment"  279      translate="label comment" 
280      type="text 280      type="text
281      sortOrder="30"  281      sortOrder="30" 
282      showInDefault="1"  282      showInDefault="1" 
283      showInWebsite="1"  283      showInWebsite="1" 
284      showInStore="1" 284      showInStore="1"
285     > 285     >
286                           286                          
287      <label> 287      <label>
288       AccessTocken 288       AccessTocken
289      </label> 289      </label>
290                           290                          
291      <depends> 291      <depends>
292                                292                               
293       <field  293       <field 
294        id="enable" 294        id="enable"
295       > 295       >
296        1 296        1
297       </field> 297       </field>
298                            298                           
299      </depends> 299      </depends>
300                       300                      
301     </field>
 301     </field> 
302                         
303     <field     
304      id="user_id"     
305      translate="label comment"     
306      type="text    
307      sortOrder="40"     
308      showInDefault="1"     
309      showInWebsite="1"     
310      showInStore="1"    
311     >    
312                              
313      <label>    
314       User Id    
315      </label>    
316                              
317      <depends>    
318                                   
319       <field     
320        id="enable"    
321       >    
322        1    
323       </field>    
324                               
325      </depends>    
326                          
327     </field>    
328                      302                     
329     <field  303     <field 
330      id="showing_counts"  304      id="showing_counts" 
331      translate="label comment"  305      translate="label comment" 
332      type="text 306      type="text
333      sortOrder="50"  307      sortOrder="50" 
334      showInDefault="1"  308      showInDefault="1" 
335      showInWebsite="1"  309      showInWebsite="1" 
336      showInStore="1" 310      showInStore="1"
337     > 311     >
338                           312                          
339      <label> 313      <label>
340       Showing Counts 314       Showing Counts
341      </label> 315      </label>
342                           316                          
343      <depends> 317      <depends>
344                                318                               
345       <field  319       <field 
346        id="enable" 320        id="enable"
347       > 321       >
348        1 322        1
349       </field> 323       </field>
350                            324                           
351      </depends> 325      </depends>
352                       326                      
353     </field> 327     </field>
354                  328                 
355    </group> 329    </group>
356             330            
357   </section> 331   </section>
358        332       
359  </system> 333  </system>
360 </config> 334 </config>