Skip to content

Commit ade55a6

Browse files
resolving merge conflict
2 parents 16c5faf + c09d40a commit ade55a6

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

frontend/.eslintcache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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",[]]

0 commit comments

Comments
 (0)