This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --cc src/zen_configurator/loaders/yaml/default.yaml | |
index d7dbb92,a174c9f..0000000 | |
--- a/src/zen_configurator/loaders/yaml/default.yaml | |
+++ b/src/zen_configurator/loaders/yaml/default.yaml | |
@@@ -165,7 -157,7 +165,11 @@@ settings | |
DO_LOGGING: true | |
HOST: 0.0.0.0 | |
MAX_INSTANCES: '3' # Front-end API request batching | |
++<<<<<<< HEAD | |
+ VERSION: v3.0-DEV |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --cc src/ggrc/models/mixins/stateful.py | |
index c2e2041,f0603c7..0000000 | |
--- a/src/ggrc/models/mixins/stateful.py | |
+++ b/src/ggrc/models/mixins/stateful.py | |
@@@ -9,8 -9,7 +9,12 @@@ from __future__ import absolute_impor | |
from enum import Enum | |
from enum import unique | |
++<<<<<<< HEAD | |
+from six.moves import map |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --cc .circleci/ci.sh | |
index fd909aa,d93f635..0000000 | |
--- a/.circleci/ci.sh | |
+++ b/.circleci/ci.sh | |
@@@ -190,24 -190,12 +190,30 @@@ checkDeployStatus() | |
[[ $retries -eq i ]] && { echo "Deployment failed."; exit 1; } | |
} | |
++<<<<<<< HEAD | |
+slackNotification() { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
table=[" x x xx", | |
" x xx x", | |
" x xx x", | |
" x x ", | |
" x x "] | |
def numAllPercs(table, numStreams): | |
matrica=[list(x) for x in table] | |
def sosedi2(e): |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
def sosedi2(e): | |
temp=[] | |
y=e[1] | |
x=e[0] | |
'''lev sosed''' | |
if y>0 & y<=len(table[0])-1 & x>=0 & x<=len(table)-1: | |
if matrica[x][y-1]==" ": | |
temp.append((x,y-1)) | |
'''desen sosed''' | |
if len(table[0])-1>y & y>=0 & x>=0 & x<=len(table)-1: |