jlcooper/git_practice2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: jlcooper:0c4b8ad6f765e181c4f11a2b03e7fee5efa440c1
Branches Tags
jlcooper:main
...
compare: jlcooper:53f3897446fca78e300f6ac3a5c16f4cb140952e
Branches Tags
jlcooper:main

2 commits
0c4b8ad6f7 ... 53f3897446

Author SHA1 Message Date
Edward Bigos
53f3897446 Fix 2025-12-04 16:32:41 -05:00
Edward Bigos
a69c3efe36 From Windows ARM 2025-12-04 15:57:49 -05:00
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
README.md
View file

@ -1,6 +1,18 @@
# git_practice2 # git_practice2
Again Again
<<<<<<< HEAD
Volume in drive C has no label.
Volume Serial Number is 9E3A-FEEA
Directory of C:\Users\edbigos\tmp\git_practice2
12/04/2025 03:56 PM <DIR> .
12/04/2025 03:56 PM <DIR> ..
12/04/2025 03:56 PM 26 README.md
1 File(s) 26 bytes
2 Dir(s) 217,728,790,528 bytes free
=======
total 368120 total 368120
drwxr-xr-x@ 9 edbigos staff 288 Jan 21 2023 Books drwxr-xr-x@ 9 edbigos staff 288 Jan 21 2023 Books
drwxr-xr-x 12 edbigos staff 384 Oct 21 2022 cset rotation drwxr-xr-x 12 edbigos staff 384 Oct 21 2022 cset rotation
@ -28,3 +40,4 @@ drwxr-xr-x 6 edbigos staff 192 Nov 26 12:06 TestRepo
drwxr-xr-x 7 edbigos staff 224 Feb 16 2024 The Boys drwxr-xr-x 7 edbigos staff 224 Feb 16 2024 The Boys
-rw-r--r-- 1 edbigos staff 12288 Oct 13 2023 Thumbs.db -rw-r--r-- 1 edbigos staff 12288 Oct 13 2023 Thumbs.db
drwxr-xr-x 4 edbigos staff 128 Dec 12 2022 Wollpert drwxr-xr-x 4 edbigos staff 128 Dec 12 2022 Wollpert
>>>>>>> 0c4b8ad6f765e181c4f11a2b03e7fee5efa440c1