From f7612970d23e71795c8869801837c1111f3255bb Mon Sep 17 00:00:00 2001
From: Bowske <adabor6@st.amu.edu.pl>
Date: Sun, 26 Apr 2020 13:32:47 +0200
Subject: [PATCH] mergeradd

---
 modele.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/modele.py b/modele.py
index 53a8463..71f0b62 100644
--- a/modele.py
+++ b/modele.py
@@ -4,9 +4,7 @@ import os
 import pygame
 import game
 import random
-<< << << < HEAD
-== == == =
->>>>>> > 7cb3aa904cd3d316c84df69942bbfdf66561a2e9
+
 
 # wysokosc i szerokosc kazdej kratki
 WIDTH = 60
@@ -148,17 +146,12 @@ class Kratka(pygame.sprite.Sprite):
     def __init__(self, poz_x, poz_y):
         self.pozX = poz_x
         self.pozY = poz_y
-
-
-<< << << < HEAD
-== == == =
         self.pozycja = (self.pozX, self.pozY)
         self.rodzic = None
         self.jestDomem = False
         self.jestKontenerem = False
         self.jestWysypiskiem = False
         self.jestPrzeszkoda = False
->>>>>> > 7cb3aa904cd3d316c84df69942bbfdf66561a2e9
         self.kolor = GREY
         self.obiekt = None
         self.g = 0  # Distance to start node