Merge branch 'main' of https://git.itguild.info/apuc/guild_front into main

com
commuit
2024-04-02 17:48:38 +03:00 · 2024-03-31 20:40:54 +03:00 · 2024-03-19 16:45:30 +03:00
1 changed files with 4 additions and 0 deletions
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
+  "name": "itguild.info",
+=======
  "name": "outstaffing-react",
+>>>>>>> 42b597d58589cfa47890a35c06fd651fc654742a
  "version": "0.1.0",
  "lockfileVersion": 3,
  "requires": true,
Author	SHA1	Message	Date
kirill boyko	b19e00d98f	Merge branch 'main' of https://git.itguild.info/apuc/guild_front into main	2024-04-02 17:48:38 +03:00
kirill boyko	9a0364e686	com	2024-03-31 20:40:54 +03:00
kirill boyko	f76e448951	commuit	2024-03-19 16:45:30 +03:00