summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike JS. Choi <mkchoi212@icloud.com>2018-05-11 19:18:28 -0500
committerMike JS. Choi <mkchoi212@icloud.com>2018-05-11 19:40:47 -0500
commit51ef7cb4ece9c4db0f7d0ce8c3aa7347d7dfdec3 (patch)
tree5bcba0b61ef4133f2ba1473b907fa4156f2d50f0
parent42aacb494488c325ecbe1a08ac51ab3629efd9eb (diff)
Remove dummy git repo
-rw-r--r--.gitignore2
m---------assets/dummy_repo0
2 files changed, 0 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 00e048d..47968ae 100644
--- 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
deleted file mode 160000
-Subproject 52015f0288618327dac43e65a2106da09da9f80