Remove dummy git repo

mkchoi212 · May 12, 2018 · 51ef7cb · 51ef7cb
1 parent 42aacb4
commit 51ef7cb
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,5 +12,3 @@ dist
 .vscode
 debug
 
-# Sample git conflict directory
-assets/dummy_repo
diff --git a/assets/dummy_repo b/assets/dummy_repo
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,5 +12,3 @@ dist @@
     .vscode
     debug
-    # Sample git conflict directory
-    assets/dummy_repo