fix conflict in gitignore and usercontroller

c718ba73 · phuctmZigexn · 06fc972a · 6278acf4 · c718ba73
Commit c718ba73 authored Aug 01, 2018 by phuctmZigexn
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 2 deletions

.gitignore
+1 -2

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,4 @@

 # Ignore master key for decrypting credentials and more.
 /config/master.key
-/assets/images/
\ No newline at end of file
+/assets/images/