nowaakademia/eco-hack
Archived
0
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/makoteq/eco-hack

Browse Source
This commit is contained in:
Maciej Kotowski committed 2021-10-02 00:47:03 +02:00
2 parents 1f39168ecd c77bcb5be9
commit 6958bda7a1
2 files changed
+642
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

package-lock.json
Generated
+638
View File
File diff suppressed because it is too large. Load diff
package.json
+4
View File
@@ -6,7 +6,11 @@
"@testing-library/jest-dom": "^5.11.4", "@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0", "@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10", "@testing-library/user-event": "^12.1.10",
<<<<<<< HEAD
"bootstrap": "^5.1.1", "bootstrap": "^5.1.1",
=======
"ol": "^6.8.1",
>>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
"react": "^17.0.2", "react": "^17.0.2",
"react-bootstrap": "^2.0.0-rc.0", "react-bootstrap": "^2.0.0-rc.0",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",