diff --git a/clone.txt b/clone.txt index 3e73103a4b92088346f370014c6f3252fb6f039f..067bab687dfa5721b310b0037923b04cd1906afd 100644 --- a/clone.txt +++ b/clone.txt @@ -1,3 +1,7 @@ add file in CLONE project modify clone.txt in Forked Project +<<<<<<< HEAD jeahyun modify +======= +modify jeahyun +>>>>>>> 60e5f56f15fcba373c8ea043bdb8688e13f96a47