# Conflicts: # apps/setting/ChangeLog # apps/widbatpc/ChangeLog |
||
|---|---|---|
| .. | ||
| ChangeLog | ||
| boot.js | ||
| settings-icon.js | ||
| settings.js | ||
| settings.png | ||
# Conflicts: # apps/setting/ChangeLog # apps/widbatpc/ChangeLog |
||
|---|---|---|
| .. | ||
| ChangeLog | ||
| boot.js | ||
| settings-icon.js | ||
| settings.js | ||
| settings.png | ||