Skip to content
Snippets Groups Projects
Commit d1b90ea2 authored by Merwane Bouri's avatar Merwane Bouri
Browse files

Revert "fix: resolve conflict merge dev into ihm-game"

This reverts commit a6cd358b, reversing
changes made to 56638be4.
parent a6cd358b
No related branches found
No related tags found
1 merge request!104devV2 comm
vs/LO23/Client/ihm-game/Views/images/pot.png

1.42 KiB

vs/LO23/Client/ihm-game/Views/images/utilisateur.png

3.91 KiB

......@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Client.ihm_game
namespace Client.ihm_main
{
class Class1
{
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="2.0.6" targetFramework="net472" />
<package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
</packages>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment