fix: resolve merge conflicts in build_and_deploy.yaml and base.html files
This commit is contained in:
		@@ -28,6 +28,7 @@
 | 
				
			|||||||
    <script defer src="/js/mobile-navbar.js"></script>
 | 
					    <script defer src="/js/mobile-navbar.js"></script>
 | 
				
			||||||
		{% block styles %}
 | 
							{% block styles %}
 | 
				
			||||||
		{% endblock styles %}
 | 
							{% endblock styles %}
 | 
				
			||||||
 | 
							<script defer data-domain="filiprojek.cz" src="https://analytics.fofrweb.com/js/script.js"></script>
 | 
				
			||||||
	</head>
 | 
						</head>
 | 
				
			||||||
	<body>
 | 
						<body>
 | 
				
			||||||
		<header>
 | 
							<header>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user