Skip to content

Commit 65ccec3

Browse files
sudarshanmaansudarshanmaan
committed
Merge branch 'main' into adjusting_fontsize
2 parents 65320f9 + 036f56a commit 65ccec3

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

‎frontend/.eslintcache‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
[{"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\index.js":"1","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\App.js":"2","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\reportWebVitals.js":"3","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\nav\\index.jsx":"4","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\homePage\\index.jsx":"5","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\svgbackground\\index.js":"6","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx":"7","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\homeNav\\index.jsx":"8","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\shortcuts\\index.jsx":"9"},{"size":562,"mtime":1610626001202,"results":"10","hashOfConfig":"11"},{"size":398,"mtime":1610626001195,"results":"12","hashOfConfig":"11"},{"size":375,"mtime":1610017619685,"results":"13","hashOfConfig":"11"},{"size":1175,"mtime":1610626001198,"results":"14","hashOfConfig":"11"},{"size":798,"mtime":1611248734772,"results":"15","hashOfConfig":"11"},{"size":898,"mtime":1610626001201,"results":"16","hashOfConfig":"11"},{"size":850,"mtime":1611248734774,"results":"17","hashOfConfig":"11"},{"size":538,"mtime":1610626001197,"results":"18","hashOfConfig":"11"},{"size":1073,"mtime":1611248734776,"results":"19","hashOfConfig":"11"},{"filePath":"20","messages":"21","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"13mscmc",{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"24","messages":"25","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"26","messages":"27","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"28","messages":"29","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"32","messages":"33","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\index.js",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\App.js",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\reportWebVitals.js",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\nav\\index.jsx",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\homePage\\index.jsx",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\svgbackground\\index.js",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx",[],["39","40"],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\homeNav\\index.jsx",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\shortcuts\\index.jsx",[],{"ruleId":"41","replacedBy":"42"},{"ruleId":"43","replacedBy":"44"},"no-native-reassign",["45"],"no-negated-in-lhs",["46"],"no-global-assign","no-unsafe-negation"]
1+
<<<<<<< HEAD
2+
[{"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\index.js":"1","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\App.js":"2","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\reportWebVitals.js":"3","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\nav\\index.jsx":"4","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\homePage\\index.jsx":"5","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\svgbackground\\index.js":"6","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx":"7","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\homeNav\\index.jsx":"8","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\shortcuts\\index.jsx":"9"},{"size":562,"mtime":1610626001202,"results":"10","hashOfConfig":"11"},{"size":398,"mtime":1610626001195,"results":"12","hashOfConfig":"11"},{"size":375,"mtime":1610017619685,"results":"13","hashOfConfig":"11"},{"size":1175,"mtime":1610626001198,"results":"14","hashOfConfig":"11"},{"size":798,"mtime":1611248734772,"results":"15","hashOfConfig":"11"},{"size":898,"mtime":1610626001201,"results":"16","hashOfConfig":"11"},{"size":850,"mtime":1611248734774,"results":"17","hashOfConfig":"11"},{"size":538,"mtime":1610626001197,"results":"18","hashOfConfig":"11"},{"size":1073,"mtime":1611248734776,"results":"19","hashOfConfig":"11"},{"filePath":"20","messages":"21","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"13mscmc",{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"24","messages":"25","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"26","messages":"27","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"28","messages":"29","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"32","messages":"33","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\index.js",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\App.js",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\reportWebVitals.js",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\nav\\index.jsx",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\homePage\\index.jsx",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\svgbackground\\index.js",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx",[],["39","40"],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\homeNav\\index.jsx",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\shortcuts\\index.jsx",[],{"ruleId":"41","replacedBy":"42"},{"ruleId":"43","replacedBy":"44"},"no-native-reassign",["45"],"no-negated-in-lhs",["46"],"no-global-assign","no-unsafe-negation"]
3+
=======
4+
[{"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\index.js":"1","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\App.js":"2","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\reportWebVitals.js":"3","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\nav\\index.jsx":"4","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\homePage\\index.jsx":"5","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\svgbackground\\index.js":"6","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx":"7","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\homeNav\\index.jsx":"8","C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\shortcuts\\index.jsx":"9"},{"size":562,"mtime":1610626001202,"results":"10","hashOfConfig":"11"},{"size":398,"mtime":1610626001195,"results":"12","hashOfConfig":"11"},{"size":375,"mtime":1610017619685,"results":"13","hashOfConfig":"11"},{"size":1175,"mtime":1610626001198,"results":"14","hashOfConfig":"11"},{"size":770,"mtime":1611247556010,"results":"15","hashOfConfig":"11"},{"size":898,"mtime":1610626001201,"results":"16","hashOfConfig":"11"},{"size":706,"mtime":1611247556012,"results":"17","hashOfConfig":"11"},{"size":538,"mtime":1610626001197,"results":"18","hashOfConfig":"11"},{"size":887,"mtime":1611247556014,"results":"19","hashOfConfig":"11"},{"filePath":"20","messages":"21","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"13mscmc",{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"24","messages":"25","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"26","messages":"27","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"28","messages":"29","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"32","messages":"33","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"34"},{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\index.js",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\App.js",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\reportWebVitals.js",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\nav\\index.jsx",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\homePage\\index.jsx",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\svgbackground\\index.js",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx",[],["39","40"],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\homeNav\\index.jsx",[],"C:\\Users\\sudar\\Desktop\\misc\\TPC-website\\frontend\\src\\components\\shortcuts\\index.jsx",[],{"ruleId":"41","replacedBy":"42"},{"ruleId":"43","replacedBy":"44"},"no-native-reassign",["45"],"no-negated-in-lhs",["46"],"no-global-assign","no-unsafe-negation"]
5+
>>>>>>> main

0 commit comments

Comments
 (0)