<feed xmlns='http://www.w3.org/2005/Atom'>
<title>tp-git, branch master</title>
<subtitle>TP GIT cours greta</subtitle>
<link rel='alternate' type='text/html' href='https://git.ordipolo.fr/cgit.cgi/tp-git/'/>
<entry>
<title>marqueurs de conflit</title>
<updated>2025-02-08T09:38:17+00:00</updated>
<author>
<name>polo-pc-greta</name>
<email>ordipolo@gmx.fr</email>
</author>
<published>2025-02-08T09:38:17+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ordipolo.fr/cgit.cgi/tp-git/commit/?id=dd26abaab487ab76808f347d30d39c2a1e623f19'/>
<id>dd26abaab487ab76808f347d30d39c2a1e623f19</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fichier TP GIT 3</title>
<updated>2025-02-08T09:29:34+00:00</updated>
<author>
<name>polo-pc-greta</name>
<email>ordipolo@gmx.fr</email>
</author>
<published>2025-02-08T09:29:34+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ordipolo.fr/cgit.cgi/tp-git/commit/?id=7b1856aeffd3118687fb08a20c762430a1f47ccc'/>
<id>7b1856aeffd3118687fb08a20c762430a1f47ccc</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fusion branche 2, conflit résolu</title>
<updated>2025-02-08T09:21:49+00:00</updated>
<author>
<name>polo-pc-greta</name>
<email>ordipolo@gmx.fr</email>
</author>
<published>2025-02-08T09:21:49+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ordipolo.fr/cgit.cgi/tp-git/commit/?id=764520f0cd1f648e4015ab738ac378b7f775fe3b'/>
<id>764520f0cd1f648e4015ab738ac378b7f775fe3b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>intro seule</title>
<updated>2025-02-08T08:34:26+00:00</updated>
<author>
<name>polo-pc-greta</name>
<email>ordipolo@gmx.fr</email>
</author>
<published>2025-02-08T08:34:26+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ordipolo.fr/cgit.cgi/tp-git/commit/?id=ebf3bcf57257bb681b6e6813603fe39a6d17bf81'/>
<id>ebf3bcf57257bb681b6e6813603fe39a6d17bf81</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>texte complet</title>
<updated>2025-02-08T08:27:34+00:00</updated>
<author>
<name>polo-pc-greta</name>
<email>ordipolo@gmx.fr</email>
</author>
<published>2025-02-08T08:27:34+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ordipolo.fr/cgit.cgi/tp-git/commit/?id=e4e49cc44da6387ce31a19418b1e545826d0c771'/>
<id>e4e49cc44da6387ce31a19418b1e545826d0c771</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>feuilles mortes</title>
<updated>2025-02-07T11:44:55+00:00</updated>
<author>
<name>polo-pc-greta</name>
<email>ordipolo@gmx.fr</email>
</author>
<published>2025-02-07T11:44:55+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ordipolo.fr/cgit.cgi/tp-git/commit/?id=7435bb1faff7078f205eadd8b4b3a82d5cb26072'/>
<id>7435bb1faff7078f205eadd8b4b3a82d5cb26072</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>utf-8 parce ce que c'est mieux</title>
<updated>2025-02-07T11:43:05+00:00</updated>
<author>
<name>polo-pc-greta</name>
<email>ordipolo@gmx.fr</email>
</author>
<published>2025-02-07T11:43:05+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ordipolo.fr/cgit.cgi/tp-git/commit/?id=7544b94beca8e6321f09124b11db7d33fc736bae'/>
<id>7544b94beca8e6321f09124b11db7d33fc736bae</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>renommage</title>
<updated>2025-02-07T10:32:49+00:00</updated>
<author>
<name>polo-pc-greta</name>
<email>ordipolo@gmx.fr</email>
</author>
<published>2025-02-07T10:32:49+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ordipolo.fr/cgit.cgi/tp-git/commit/?id=d74359ac2e66627e4b146b911650df28c51a732e'/>
<id>d74359ac2e66627e4b146b911650df28c51a732e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fichier TP GIT 2</title>
<updated>2025-02-07T10:22:38+00:00</updated>
<author>
<name>polo-pc-greta</name>
<email>ordipolo@gmx.fr</email>
</author>
<published>2025-02-07T10:22:38+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ordipolo.fr/cgit.cgi/tp-git/commit/?id=dd6bdad360e2ff848b932b988685716bf05aeb1a'/>
<id>dd6bdad360e2ff848b932b988685716bf05aeb1a</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>fichier TP GIT 1 et README.md en majuscules</title>
<updated>2025-02-07T09:46:34+00:00</updated>
<author>
<name>polo-pc-greta</name>
<email>ordipolo@gmx.fr</email>
</author>
<published>2025-02-07T09:46:34+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ordipolo.fr/cgit.cgi/tp-git/commit/?id=306d63cf955b6cb1da80827ae8003bca3eb009da'/>
<id>306d63cf955b6cb1da80827ae8003bca3eb009da</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
