I have now changed the one on github to:

Here is the first line
THIS IS NOW NOT EMPTY ANY MORE
Above is an empty line
Here is the second line without any space between text "Above is an empty line"

THE LINE ABOVE HOWEVER IS EMPTY
123, her er noget nyt

---------------------------------------------------
and the one on my pc to:

Here is the first line
nu er den ikke længere tom
Above is an empty line
Here is the second line without any space between text "Above is an empty line"

----------------------------------------------------

Original file says:

Here is the first line

Above is an empty line
Here is the second line without any space between text "Above is an empty line"

Signed-off-by: Mikkel Urban Kajgaard <muk@trackunit.com>
Merge branch 'master' of https://github.com/Trackunit/first_repos

Conflicts:
	merging_test.txt
 I have now attempted to merge this file
In USER_APPLICATION3 there is now added the function of getting the cellID from the modem. The modem as well now indicates if it is on 3G

Signed-off-by: Mikkel Urban Kajgaard <muk@trackunit.com>