Ladebeze66/ft_transcendence
1
0
Fork 0
mirror of https://github.com/AudebertAdrien/ft_transcendence.git synced 2025-12-18 15:07:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
CHIBOUB Chakib 2024-07-31 15:33:55 +02:00
parent 1a392332a3
commit 78965de13d
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pong/game/views.py
View File

@ -2,12 +2,9 @@
from django.shortcuts import render from django.shortcuts import render
<<<<<<< HEAD
def index(request): def index(request):
return render(request, 'index.html') return render(request, 'index.html')
=======
>>>>>>> f31331d344927dfd9bca940943bdba9a4d79a2b4
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from .models import Player, Tournoi, Match from .models import Player, Tournoi, Match
from .utils import create_player, create_tournoi, create_match from .utils import create_player, create_tournoi, create_match
@ -18,11 +15,6 @@ from django.views.decorators.csrf import csrf_exempt
import json import json
import uuid import uuid
def index(request):
return render(request, 'index.html')
@csrf_exempt @csrf_exempt
def register_user(request): def register_user(request):
if request.method == 'POST': if request.method == 'POST':