Resources attached to the Road To DevOps tutorial https://blog.noobtoroot.xyz/road-to-devops/
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

100 lines
3.2 KiB

<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="180.90692mm"
height="45.13401mm"
viewBox="0 0 180.90692 45.13401"
version="1.1"
id="svg8"
inkscape:version="0.92.4 (unknown)"
sodipodi:docname="conflict.svg">
<defs
id="defs2" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4"
inkscape:cx="425.70295"
inkscape:cy="-41.857697"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1920"
inkscape:window-height="1052"
inkscape:window-x="1920"
inkscape:window-y="0"
inkscape:window-maximized="1" />
<metadata
id="metadata5">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-14.449824,-28.945932)">
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:5.43153238px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
x="22.796806"
y="38.488358"
id="text817"><tspan
sodipodi:role="line"
id="tspan815"
x="22.796806"
y="38.488358"
style="stroke-width:0.26458332">&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD</tspan><tspan
sodipodi:role="line"
x="22.796806"
y="45.277775"
style="stroke-width:0.26458332"
id="tspan819">foo</tspan><tspan
sodipodi:role="line"
x="22.796806"
y="52.067188"
style="stroke-width:0.26458332"
id="tspan821">=======</tspan><tspan
sodipodi:role="line"
x="22.796806"
y="58.856606"
style="stroke-width:0.26458332"
id="tspan823">bar</tspan><tspan
sodipodi:role="line"
x="22.796806"
y="65.646019"
style="stroke-width:0.26458332"
id="tspan825">&gt;&gt;&gt;&gt;&gt;&gt;&gt; cb1abc6bd98cfc84317f8aa95a7662815417802d</tspan></text>
<rect
style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect827"
width="180.40692"
height="44.63401"
x="14.699824"
y="29.195932" />
</g>
</svg>