Merge branch 'master' of https://github.com/j-hoppe/MACRO11

# Conflicts: # README.md
cfib · Nov 2, 2016 · 263646f · 263646f
2 parents a31418b + 5e67f9f
commit 263646f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # MACRO11
+<<<<<<< HEAD
 MACRO11 is an PDP-11 cross assembler, written in C.
 Projects files are included for MS Visual Studio, as it's been uses as part of  PDP11GUI.
 
@@ -12,3 +13,6 @@ Changes since then:
 
 Also see the [MACRO11 page](http://www.retrocmp.com/tools/macro11).
 
+=======
+PDP-11 crossassembler
+>>>>>>> 5e67f9fd23ac6874fcfe9732db5c80a34c252a29