22c00e8d3c
Conflicts: build/prod/cyberchef.htm build/prod/index.html build/prod/scripts.js src/static/stats.txt
36 lines
483 B
Plaintext
36 lines
483 B
Plaintext
<<<<<<< HEAD
|
|
202 source files
|
|
104399 lines
|
|
size
|
|
|
|
136 JavaScript source files
|
|
95309 lines
|
|
=======
|
|
203 source files
|
|
104274 lines
|
|
4.0M size
|
|
|
|
136 JavaScript source files
|
|
95184 lines
|
|
>>>>>>> master
|
|
3.5M size
|
|
|
|
78 third party JavaScript source files
|
|
76377 lines
|
|
2.7M size
|
|
|
|
58 first party JavaScript source files
|
|
<<<<<<< HEAD
|
|
18932 lines
|
|
740K size
|
|
=======
|
|
18807 lines
|
|
728K size
|
|
>>>>>>> master
|
|
|
|
3.2M uncompressed JavaScript size
|
|
1.7M compressed JavaScript size
|
|
|
|
15 categories
|
|
155 operations
|