| Merge branch 'PenDetailFragment' # Conflicts: # .idea/misc.xml | 
|---|
| .idea/gradle.xml | 
|---|
| .idea/misc.xml | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java 0 → 100644 | 
|---|