| commit | 0eb622f7da94d0268e56b5f037109d2887241708 | [log] [tgz] |
|---|---|---|
| author | Saurabh <saurabh6790@gmail.com> | Thu May 31 17:32:17 2018 +0530 |
| committer | Saurabh <saurabh6790@gmail.com> | Thu May 31 17:32:17 2018 +0530 |
| tree | 34d2a42dfd7be2f379973b1860af269190d259c3 | |
| parent | c55f774fbf415be88d227a1fe578a8ee96408dc1 [diff] [blame] | |
| parent | defecd37852a3d921fd4e12fd3a77157ee91155f [diff] [blame] |
[fix] resolve conflicts
diff --git a/.gitignore b/.gitignore index 68272c7..2b52a49 100644 --- a/.gitignore +++ b/.gitignore
@@ -9,6 +9,9 @@ dist/ erpnext/docs/current *.swp +<<<<<<< HEAD *.swo __pycache__ *~ +======= +>>>>>>> master