# Conflicts: # .gitignore # android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/tools/PCBcontext.java # android/Pictogram/tablet/src/main/java/com/yottacode/pictogram/tablet/net/NetServiceTablet.java # sails/src/assets/app/i18n/en-gb.json
