Skip to content

Commit b990959

Browse files
committed
Fix badly merged line.
1 parent 3daa6d4 commit b990959

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

README-ja.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
🌍
2-
<<<<<<< HEAD
3-
*[Čeština](README-cs.md)[Deutsch](README-de.md)[Ελληνικά](README-el.md)[English](README.md)[Español](README-es.md)[Français](README-fr.md)[Italiano](README-it.md)[日本語](README-ja.md)[한국어](README-ko.md)[Português](README-pt.md)[Русский](README-ru.md)[Română](README-ro.md)[Slovenščina](README-sl.md)[Українська](README-uk.md)[简体中文](README-zh.md)[繁體中文](README-zh-Hant.md)*
4-
=======
5-
*[Čeština](README-cs.md)[Deutsch](README-de.md)[Ελληνικά](README-el.md)[English](README.md)[Español](README-es.md)[Français](README-fr.md)[Indonesia](README-id.md)[Italiano](README-it.md)[日本語](README-ja.md)[한국어](README-ko.md)[Português](README-pt.md)[Русский](README-ru.md)[Slovenščina](README-sl.md)[Українська](README-uk.md)[简体中文](README-zh.md)[繁體中文](README-zh-Hant.md)*
6-
>>>>>>> 15078231034199f1587320d98b1ab294511c681a
2+
*[Čeština](README-cs.md)[Deutsch](README-de.md)[Ελληνικά](README-el.md)[English](README.md)[Español](README-es.md)[Français](README-fr.md)[Indonesia](README-id.md)[Italiano](README-it.md)[日本語](README-ja.md)[한국어](README-ko.md)[Português](README-pt.md)[Română](README-ro.md)[Русский](README-ru.md)[Slovenščina](README-sl.md)[Українська](README-uk.md)[简体中文](README-zh.md)[繁體中文](README-zh-Hant.md)*
73

84
原文のコミット [ee4b00bc396087d27231f60512aeb77b19ce734e](https://github.com/jlevy/the-art-of-command-line/blob/ee4b00bc396087d27231f60512aeb77b19ce734e/README.md)
95

0 commit comments

Comments
 (0)