Merge pull request #73 from enpitut2019/Nagata

Nagata

Assets/cleanPlaceData.json

@@ -1 +1,5 @@
-{"placeDataList":[{"place":"test","lastUpdateTime_forSave":{"year":2019,"month":11,"day":14,"hour":18,"minute":0,"second":47},"cleanInterval_forSave":{"year":0,"month":0,"day":1,"hour":0,"minute":0,"second":0}},{"place":"unko","lastUpdateTime_forSave":{"year":2019,"month":11,"day":14,"hour":18,"minute":24,"second":44},"cleanInterval_forSave":{"year":0,"month":1,"day":0,"hour":0,"minute":0,"second":0}}]}
+<<<<<<< HEAD
+{"placeDataList":[{"place":"daigo","lastUpdateTime":{"year":2019,"month":11,"day":11,"hour":20,"minute":8,"second":12},"cleanInterval":{"year":10,"month":0,"day":5,"hour":0,"minute":0,"second":0},"dateData":"11月11日20時8分12秒","cleanIntervalText":"10年5日"},{"place":"daigogogo","lastUpdateTime":{"year":2019,"month":11,"day":11,"hour":19,"minute":25,"second":18},"cleanInterval":{"year":0,"month":0,"day":0,"hour":0,"minute":0,"second":0},"dateData":"11月11日19時25分18秒","cleanIntervalText":""},{"place":"藤村大吾","lastUpdateTime":{"year":2019,"month":11,"day":11,"hour":19,"minute":58,"second":21},"cleanInterval":{"year":0,"month":0,"day":0,"hour":0,"minute":0,"second":0},"dateData":"11月11日19時58分21秒","cleanIntervalText":"0秒"},{"place":"４","lastUpdateTime":{"year":2019,"month":11,"day":14,"hour":15,"minute":51,"second":9},"cleanInterval":{"year":0,"month":0,"day":7,"hour":0,"minute":0,"second":0},"dateData":"11月14日15時51分9秒","cleanIntervalText":"7日"},{"place":"リビング","lastUpdateTime":{"year":2019,"month":11,"day":14,"hour":16,"minute":26,"second":17},"cleanInterval":{"year":0,"month":0,"day":0,"hour":0,"minute":0,"second":0},"dateData":"11月14日16時26分17秒","cleanIntervalText":"0秒"}]}
+=======
+{"placeDataList":[{"place":"test","lastUpdateTime_forSave":{"year":2019,"month":11,"day":14,"hour":18,"minute":0,"second":47},"cleanInterval_forSave":{"year":0,"month":0,"day":1,"hour":0,"minute":0,"second":0}},{"place":"unko","lastUpdateTime_forSave":{"year":2019,"month":11,"day":14,"hour":18,"minute":24,"second":44},"cleanInterval_forSave":{"year":0,"month":1,"day":0,"hour":0,"minute":0,"second":0}}]}
+>>>>>>> 88a60e21e0199aecd9b24bfc1daba1d5957ce6d9