apraga/org - Change YIZRCFSRGPUSNGAIT7XGOINNT7RH75MNYZOO4XDE4TNTTNM6I3JAC

Merge branch 'master' of github.com:apraga/org

Created by Alexis Praga on April 12, 2022

YIZRCFSRGPUSNGAIT7XGOINNT7RH75MNYZOO4XDE4TNTTNM6I3JAC

Dependencies

In channels

main

Change contents

Insertion in workout.org at line 5198 [5.1]
[4.13398]
[2.1]
```
<<<<<<< HEAD
```
Solving an order conflict in workout.org at line 5202 [5.1]
[2.90]
Insertion in workout.org at line 5202 [5.1]
[0.16]
[6.1]
```
=======
```

Insertion in workout.org at line 5206 [5.1]

[6.116]

>>>>>>> 48df6255c9ef1705edd7f58974a79cf24f0752ec

Insertion in todo.org at line 69 [5.117455]

[5.119168]

[2.100]

<<<<<<< HEAD
* TODO Appeler pour demander carte médecin internat

Resurrecting zombie bytes in todo.org at line 72 [5.117455]

B:B[7.229] → [6.126:317]

BD:B[7.229] → [6.126:317]

∅:∅[8.72] → [9.805:1622]

∅:∅[6.317] → [9.805:1622]

B:B[7.229] → [9.805:1622]

BD:B[7.229] → [9.805:1622]

B:B[9.1622] → [6.318:378]

BD:B[9.1622] → [6.318:378]

∅:∅[6.378] → [9.1622:1775]

B:B[9.1622] → [9.1622:1775]

BD:B[9.1622] → [9.1622:1775]

** DONE Utiliser chèque énergie
CLOSED: [2022-04-10 Sun 17:20] SCHEDULED: <2022-04-10 Sun>
** TODO
:PROPERTIES:
:test:
:END:
** TODO Utiliser chèque Chuullanka
SCHEDULED: <2022-04-17 Sun>
* Japonais :japonais:
** Miura :anki:
:PROPERTIES:
:CATEGORY: miura
:END:
*** TODO Leçon 2
**** TODO Grammaire
*** DONE leçon 1 vocab
*** DONE Leçon 2 : Vocabulaire
** Leçon Aya
:PROPERTIES:
:CATEGORY: aya
:END:
*** DONE Notes leçon <2022-03-20 Sun>
SCHEDULED: <2022-04-03 Sun>
*** DONE Notes leçon <2022-03-27 Sun>
SCHEDULED: <2022-04-03 Sun>
*** DONE Notes leçon <2022-04-03 Sun>
SCHEDULED: <2022-04-03 Sun>
*** TODO Lire dialogue fin leçon 10
SCHEDULED: <2022-04-03 Sun>
* Ledger
:PROPERTIES:
:CATEGORY: compta
:END:
** DONE janvier 2022
** TODO février 2022
DEADLINE: <2022-03-27 Sun>
* Moto :moto:
** TODO Réparer
*** DONE Dépannage
CLOSED: [2022-04-09 Sat 14:25]
Pas de réparation possible avan fin avril
*** TODO Appel garage Yamaha Besançon pour commencer réparation
SCHEDULED: <2022-04-29 Fri>
*** TODO Notes <2022-04-10 Sun>
SCHEDULED: <2022-04-10 Sun>
* Notes biologie
** Biologie cellulaire Dunod
*** TODO chapitres déjà fait :anki:
*** TODO lire
** Biologie chimie Dunod
*** TODO lire
*** TODO Ficher

Solving an order conflict in todo.org at line 72 [5.117455]
[2.128]

Insertion in todo.org at line 72 [5.117455]

[0.153]

[6.126]

=======
* Emacs
:PROPERTIES:
:CATEGORY: emacs
:END:
* Inbox
** TODO Organiser enterrement vie de garçon :joris:
** TODO Rattraper retard anki
** TODO Appeler pour demander carte médecin internat
DEADLINE: <2022-03-30 Wed>

Insertion in todo.org at line 134 [5.117455]
[9.1775]
[7.229]
```
>>>>>>> 48df6255c9ef1705edd7f58974a79cf24f0752ec
```
Resurrecting zombie bytes in todo.org at line 180 [5.117455]
B:B[5.121211] → [2.129:201]
BD:B[5.121211] → [2.129:201]
B:B[10.288] → [2.202:203]
BD:B[10.288] → [2.202:203]
```
** Genome
*** TODO Regarder trafic réseau
SCHEDULED: <2022-04-12 Tue>
```

Insertion in todo.org at line 184 [5.117455]

[2.201]

[2.202]

* Emacs
:PROPERTIES:
:CATEGORY: emacs
:END:
* Inbox
** WAIT Commander nouvelle CB :banque:
SCHEDULED: <2022-04-10 Sun>
Demande faite <2022-04-03 Sun>

Insertion in todo.org at line 193 [5.117455]

[2.203]

[2.204]

* Ledger
:PROPERTIES:
:CATEGORY: compta
:END:
** DONE janvier 2022
** TODO février 2022

Deletion in todo.org at line 200 [5.117455]
B:BD[5.121211] → [6.379:380]
Solving an order conflict in todo.org at line 200 [5.117455]
[2.232]
[6.380]

Deletion in todo.org at line 206 [5.117455]

B:BD[5.119168] → [9.615:804]

BD:BD[5.119168] → [9.615:804]

* Emacs
:PROPERTIES:
:CATEGORY: emacs
:END:
* Inbox
** TODO Organiser enterrement vie de garçon :joris:
** TODO Rattraper retard anki
** TODO Appeler pour demander carte médecin internat

Solving an order conflict in todo.org at line 206 [5.117455]
[3.23]
Insertion in todo.org at line 206 [5.117455]
[0.673]
```
** TODO Kitty 0.25
SCHEDULED: <2022-04-13 Wed>
```

Merge branch 'master' of github.com:apraga/org

Dependencies

In channels

Change contents

Insertion in workout.org at line 5198 [5.1]

Solving an order conflict in workout.org at line 5202 [5.1]

Insertion in workout.org at line 5202 [5.1]

Insertion in workout.org at line 5206 [5.1]

Insertion in todo.org at line 69 [5.117455]

Resurrecting zombie bytes in todo.org at line 72 [5.117455]

Solving an order conflict in todo.org at line 72 [5.117455]

Insertion in todo.org at line 72 [5.117455]

Insertion in todo.org at line 134 [5.117455]

Resurrecting zombie bytes in todo.org at line 180 [5.117455]

Insertion in todo.org at line 184 [5.117455]

Insertion in todo.org at line 193 [5.117455]

Deletion in todo.org at line 200 [5.117455]

Solving an order conflict in todo.org at line 200 [5.117455]

Deletion in todo.org at line 206 [5.117455]

Solving an order conflict in todo.org at line 206 [5.117455]

Insertion in todo.org at line 206 [5.117455]