resolving merge conflict

Aksh-Bansal-dev · Aksh-Bansal-dev · commit ade55a6cbf2a · 2021-05-10T17:00:05.000+05:30
diff --git a/frontend/.eslintcache b/frontend/.eslintcache
@@ -1 +1 @@
-[{"D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx":"1"},{"size":850,"mtime":1620645930372,"results":"2","hashOfConfig":"3"},{"filePath":"4","messages":"5","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"t5wa8d","D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx",[]]
+[{"D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx":"1"},{"size":850,"mtime":1620646166555,"results":"2","hashOfConfig":"3"},{"filePath":"4","messages":"5","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"t5wa8d","D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx",[]]

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-[{"D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx":"1"},{"size":850,"mtime":1620645930372,"results":"2","hashOfConfig":"3"},{"filePath":"4","messages":"5","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"t5wa8d","D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx",[]]`
	`1`	`+[{"D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx":"1"},{"size":850,"mtime":1620646166555,"results":"2","hashOfConfig":"3"},{"filePath":"4","messages":"5","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"t5wa8d","D:\\code\\web\\github\\TPC-website\\frontend\\src\\components\\navLinks\\index.jsx",[]]`