Commit 7beac051 authored by Mihkel Putrinš's avatar Mihkel Putrinš

fix merge issue

parent 5055700e
...@@ -22,10 +22,6 @@ var user_data = {} ...@@ -22,10 +22,6 @@ var user_data = {}
var data = ipc.sendSync('getUser', null) var data = ipc.sendSync('getUser', null)
var initialize = function initialize() { var initialize = function initialize() {
<<<<<<< HEAD:code/main.js
=======
// console.log('user_data: ' + data)
>>>>>>> master:code/panu.js
if (!data) { if (!data) {
data = JSON.parse(clipboard.readText()) data = JSON.parse(clipboard.readText())
clipboard.clear() clipboard.clear()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment