%!s(int64=4) %!d(string=hai) anos · 11d186a701
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -8,11 +8,7 @@
 
				 ;; Keywords: outlines, hypermedia, calendar, wp
			
 
				 ;; Homepage: https://orgmode.org
			
 
				 
			
 
				-<<<<<<< HEAD
			
 
				 ;; Version: 9.5-dev
			
 
				-=======
			
 
				-;; Version: 9.4.3
			
 
				->>>>>>> maint
			
 
				 
			
 
				 ;; This file is part of GNU Emacs.
			
 
				 ;;